diff -Nru libgtkdatabox-0.9.1.1/AUTHORS libgtkdatabox-0.9.2.0/AUTHORS --- libgtkdatabox-0.9.1.1/AUTHORS 2009-04-19 22:41:50.000000000 +0000 +++ libgtkdatabox-0.9.2.0/AUTHORS 2012-11-09 04:16:55.000000000 +0000 @@ -8,3 +8,4 @@ Project Maintainer as of 04/15/2009: ------------------------------------ Brian R Phelps aka electronjunkie can be contacted at lm317t dot gmail.com +Matt Flax < flatmax > diff -Nru libgtkdatabox-0.9.1.1/ChangeLog libgtkdatabox-0.9.2.0/ChangeLog --- libgtkdatabox-0.9.1.1/ChangeLog 2009-05-11 00:49:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/ChangeLog 2012-11-09 04:49:56.000000000 +0000 @@ -1,3 +1,244 @@ +2012-11-8 (0.9.2.0) + - There has been a huge amount of change since the last release... + There are many new graphing methods, such as offset bars, region plots. + There are a large number of enhancements to ruler displays including + various methods to shift tick marks, set manual labels and many many + other options. Have a look at the examples for rulers, and basics2 + + here is the git log ... + commit 49b41abef695f416846c56b675627156ecf19e9d + Author: Matt Flax + Date: Thu Nov 8 22:10:31 2012 -0600 + + Moved stale documentation to the old directory. + Created Doxygen documentation ... slightly easier to manage. + New documentation is in api/html + + commit e6d55a986edd9c16227aa6db9b19d0704dc77c3f + Author: Matt Flax + Date: Fri Sep 7 15:13:55 2012 -0500 + + Added a function to give ticks horizontal pixel offsets. + You can now move ticks left and right within the ruler. + + These functions are : + void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler * ruler,gint offset); + gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler * ruler); + + commit 4bed6683da41f692ccad4ad009defbde14d9bd98 + Author: Matt Flax + Date: Tue Jul 31 08:34:25 2012 -0500 + + Added Lars-Peter Clausen fix for the following error : + The 'hide' property is registered with the 'size' property's id. As a result + changing the 'hide' property using glib's property system will change the 'size' + property instead. + + commit d5440b1cee1646fff7488dc8e557a42f09d9d3ca + Author: Matt Flax + Date: Wed Jul 25 14:15:53 2012 -0500 + + Added a box shodow feature to the gtkdatabox main graphing pixmap. The main data graph window can now have a box specified using the GtkShadowType enumeration - as for rulers. + Added text alignment for vertical rulers with horizontal text. + Labels are aligned using PANGO_ALIGN_RIGHT, PANGO_ALIGN_CENTER, PANGO_ALIGN_LEFT. + + commit 849a5cf214be2047d053d45b1a2b16ee17c34f79 + Author: Matt Flax + Date: Wed Jul 18 11:05:48 2012 -0500 + + Added a no shadow example to the rulers.c + + commit f01837c0c0bee04a62179d762109bae9a851c38c + Author: Matt Flax + Date: Wed Jul 18 10:47:03 2012 -0500 + + Added the ability to change the shadowing on the ruler boxes. You can now set to one of GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT. + Fixed label alignment for the case when there are no ticks. The labels now align where the tick marks would have been. + Added myself to copyright on the files I added to the project. + + commit a76a511f657de8115b92765d4704d5ee9ac57363 + Author: Matt Flax + Date: Sat Jul 14 11:29:39 2012 -0500 + + Added a C++ Gtk+IOStream.C example use of GtkDataBox to the examples directory. + + commit cb5df87f829f8d043ac617f2f78a1305d2b50a9d + Author: Matt Flax + Date: Thu May 24 16:21:47 2012 -0500 + + Removed old patch errors. + + commit 87bda0ce2171404b675a6441708775390b05d4fb + Author: Matt Flax + Date: Thu May 24 11:59:28 2012 -0500 + + Altered te gitignore file and removed various autogenerated files - as requested by lars-peter Clausen + + commit e04801e2d1110051c5ccbe5adfeed2b4ee07fe6a + Author: Matt Flax + Date: Wed May 23 13:45:51 2012 -0500 + + removed old archives which exist in the .git history + + commit 21af1e485e5f2fcf2d4da824ecf621b20032858c + Author: Matt Flax + Date: Wed May 23 13:43:25 2012 -0500 + + Archived the VC++ project to reduce space. + + commit 66cf9e02e7c3cdf44199058930ab7c6146524bce + Author: U-EEE\_ <_@eee.(none)> + Date: Wed May 23 13:40:42 2012 -0500 + + Added changes to get the system compiling to a static library in VC++ + + commit 936dcd9483df2e4af7f1e98aa97d59b69a5b9b78 + Author: Matt Flax + Date: Mon Apr 23 13:15:24 2012 -0500 + + Fixed a bug where arrows were displayed when the draw_position flag was set to false. + + commit d2a5883f8a6b1c0248b4f630e3d5ab8c7fed0f6a + Author: Matt Flax + Date: Mon Apr 16 17:26:39 2012 -0500 + + set cleared pointers to NULL to avoid problems in accessing unreffed object pointers. + + commit 979b452720c37818ed224abd7098599f379e2efe + Author: Matt Flax + Date: Mon Apr 16 17:16:49 2012 -0500 + + Got rid of debugging printf statements. + Minor changes and removal of un-necessary freezes. + + commit 8c53bab1eafb830cc869e4987937eb77d22cd5e3 + Author: Matt Flax + Date: Fri Apr 13 16:57:49 2012 -0500 + + Added the option to disable ruler position indicators and updates. + Isolated major bug in the unrealize functions where priv members were freed. + Now fixed. + Various other minor fixes. + + commit 405df94e621ceb29d71ab2d77b9a4a56c09e99db + Author: Matt Flax + Date: Fri Apr 6 08:42:58 2012 -0500 + + removed a spurious printf statemnt. + + commit bd5872cb15944bc7a2d00054caed758e046dcdbb + Author: Matt Flax + Date: Thu Apr 5 16:59:07 2012 -0500 + + Added various realized and unrealized fixes for gtkdatabox and gtkdatabox_ruler + Other minor changes. + + commit 53a408b3074309df87c4fd91f9098876280f5310 + Author: Matt Flax + Date: Wed Mar 28 10:16:01 2012 -0600 + + Added the ability to manually set tick labels at particular tick locations. + Standard tick formatting is now expanded to handle formatting ticks of length 1 character. Previously it was limited to not be able to display formats as short as one character. + examples/rulers demonstrates this new feature. + Added manual tick labels example to box[2] in examples/rulers.c + gtkdatabox_ruler.c now has the various manual_tick_label variable, functions and properties for setting manual tick labels. + + commit 57a0a6a88eec9f08d4fed444409a67a57815116f + Author: Matt Flax + Date: Wed Mar 21 13:21:59 2012 -0500 + + Added the option to remove tick marks all together (still retains labels). + + commit 7bfcd71274085711e8a31fe7b449ee6c541a7e5b + Author: Matt Flax + Date: Tue Mar 20 16:51:31 2012 -0500 + + Fixed a bug in the manual x axis tick placement. + + commit e8246cdecfa2bb1159ca5924c1efc1e0168671ca + Author: Matt Flax + Date: Tue Mar 20 11:54:54 2012 -0500 + + Added the option to manually specify tick label locations. + The functions are gtk_databox_ruler_set_manual_tick_cnt and gtk_databox_ruler_set_manual_ticks. + There is an example in examples/rulers + + commit 59292ffa5be4699621fecdfb06ca166a2ebf24c8 + Author: Matt Flax + Date: Mon Mar 19 17:58:30 2012 -0500 + + Fixed a bug in gtkdatabox_regions where g_object_new wasn't terminated with NULL. + Altered hline_vals and vline_vals to no longer be global static variables. They are now proper object properties in gtkdatabox_grid. + + commit 646d9db0ae3703ac998709774201677ef17b5a0f + Author: Matt Flax + Date: Fri Mar 16 17:08:37 2012 -0500 + + New ruler features. Shown in examples/rulers.c + Rulers may new reside on opposite sides to where they normally do (gtk_databox_ruler_set_invert_edge). + Ruler label formatting may be specified (gtk_databox_ruler_set_linear_label_format and gtk_databox_ruler_set_log_label_format). + gtkdatabox plots may now be started with the rulers on the opposite sides (gtk_databox_create_box_with_scrollbars_and_rulers_positioned). + + commit 8c8282056172e435cc42ba94a64831b552849d30 + Author: Matt Flax + Date: Thu Mar 15 17:45:54 2012 -0500 + + Added new features to rulers. + Rulers can now be displayed without subtick marks. + Y rulers can now be displayed with horizontal text. + + commit 93a97a29c993de25fa20c427cabf6e751bac2c29 + Author: Matt Flax + Date: Tue Mar 13 16:54:02 2012 -0500 + + Added a double button press handler - when the button is pressed twice, it emulates button 3. + This allows touch screens to zoom out. + + commit cfdbca298f43f67cdb718930bc5282f373bec783 + Author: Matt Flax + Date: Tue Mar 6 10:22:20 2012 -0600 + + Removed the redundant size variable from gtkdatabox_regions_new + + commit f39a4985637d1af85fa26f49288cd1b1d5292d98 + Author: Matt Flax + Date: Thu Mar 1 15:52:38 2012 +1100 + + Added offset_bar plotting. + Added region plotting. + Both offset_bar and region plots are now demonstrated in the basics2.c example file. + Added the new source code files to the gtk/Makefile.am + Removed a redundant variable 'GdkPoint *xyc_graph;' from the gtkdatabox_xyc_graph. + Added the function 'gtk_databox_graph_add_front' to plot ontop of everything else already plotted. + Added the new gtkdatabox_xyyc_graph which allows plots with two y co-ordinates for each x ordinate. + + commit cc787640589f99bcb206875612ebd33079bab5a8 + Author: Matt Flax + Date: Thu Mar 1 15:38:39 2012 +1100 + + Another commit to remove auto-generated files. + This is done to make diffs a little simpler to read. + + commit 12499c3d7ccafd2da5ab1745be131461778f88e3 + Author: Matt Flax + Date: Thu Mar 1 15:17:23 2012 +1100 + + Removed all binaries and other files which make 'git diff' confusing to look at. + + commit ca0f688034c54516c1000d20836ddaadb6f43ac9 + Author: Brian R Phelps + Date: Fri Oct 14 17:23:56 2011 -0400 + + Applied debian patches for deprecated function calls + +2011-07-15 (0.9.1.3) + -Patch to allow building on newer gtk versions. Submitted by Thomas + Stover. GTK_WIDGET_STATE, GTK_WIDGET_DRAWABLE, GTK_WIDGET_STATE, + GTK_WIDGET_VISIBLE are deprecated and need replacing with + gtk_widget_get_ + -Updated basics example to demonstrate scroll-wheel functions +2011-07-15 (0.9.1.2) + scrollwheel zooms 2009-05-10 (0.9.1.1) -Patch which replaces the static grid value arrays by per-object arrays (adding appropriate get/set functions and object diff -Nru libgtkdatabox-0.9.1.1/INSTALL libgtkdatabox-0.9.2.0/INSTALL --- libgtkdatabox-0.9.1.1/INSTALL 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/INSTALL 2012-10-03 19:28:52.000000000 +0000 @@ -15,6 +15,8 @@ more-detailed instructions are generic; see the `README' file for instructions specific to this package. +If the configure script is missing, run the script : scripts/myAutoreconf.sh + 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. diff -Nru libgtkdatabox-0.9.1.1/Makefile.am libgtkdatabox-0.9.2.0/Makefile.am --- libgtkdatabox-0.9.1.1/Makefile.am 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/Makefile.am 2012-11-09 04:56:55.000000000 +0000 @@ -3,8 +3,8 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gtkdatabox.pc -SUBDIRS = gtk glade examples docs +SUBDIRS = gtk glade examples -EXTRA_DIST = m4 depcomp scripts gtkdatabox.pc.in gtkdatabox.spec.in glade/gtkdatabox.xml +EXTRA_DIST = m4 depcomp scripts gtkdatabox.pc.in gtkdatabox.spec.in glade/gtkdatabox.xml api DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff -Nru libgtkdatabox-0.9.1.1/Makefile.in libgtkdatabox-0.9.2.0/Makefile.in --- libgtkdatabox-0.9.1.1/Makefile.in 2009-05-11 00:57:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/Makefile.in 2012-11-09 05:04:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -18,8 +19,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -50,6 +52,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = gtkdatabox.pc gtkdatabox.spec +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -64,12 +67,35 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -77,12 +103,41 @@ 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); }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -103,6 +158,7 @@ DATABOX_VERSION = @DATABOX_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -115,6 +171,10 @@ GLADE3_LIBS = @GLADE3_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_REQUIRED = @GTK_REQUIRED@ @@ -137,9 +197,11 @@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -148,12 +210,15 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_CFLAGS = @PANGO_CFLAGS@ PANGO_LIBS = @PANGO_LIBS@ PANGO_REQUIRED = @PANGO_REQUIRED@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -164,6 +229,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -199,7 +265,6 @@ libglade_moduledir = @libglade_moduledir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -212,32 +277,33 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gtkdatabox.pc -SUBDIRS = gtk glade examples docs -EXTRA_DIST = m4 depcomp scripts gtkdatabox.pc.in gtkdatabox.spec.in glade/gtkdatabox.xml +SUBDIRS = gtk glade examples +EXTRA_DIST = m4 depcomp scripts gtkdatabox.pc.in gtkdatabox.spec.in glade/gtkdatabox.xml api DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -253,21 +319,20 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(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: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -285,24 +350,25 @@ -rm -rf .libs _libs distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + 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"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ 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 + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -311,7 +377,7 @@ # (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'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -328,7 +394,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -336,7 +402,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -362,16 +428,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__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); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -379,14 +445,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { 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=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -398,7 +464,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -407,36 +473,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__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) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -452,50 +523,75 @@ 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 "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @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 && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -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) + || 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 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -519,15 +615,19 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -535,10 +635,13 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -559,14 +662,24 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(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 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -600,16 +713,22 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -630,6 +749,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -638,18 +759,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -672,25 +803,26 @@ uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma 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-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-pkgconfigDATA + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + 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-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-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 -Nru libgtkdatabox-0.9.1.1/NEWS libgtkdatabox-0.9.2.0/NEWS --- libgtkdatabox-0.9.1.1/NEWS 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/NEWS 2012-11-09 04:17:37.000000000 +0000 @@ -1 +1 @@ -See ChangeLog +From late 2012 ... the push will be to integrate changes for GTK3 \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/README libgtkdatabox-0.9.2.0/README --- libgtkdatabox-0.9.1.1/README 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/README 2012-11-09 04:44:35.000000000 +0000 @@ -11,16 +11,12 @@ The homepage of the GtkDatabox is -http://www.eudoxos.de/gtk/gtkdatabox/ +http://sourceforge.net/projects/gtkdatabox/ -The only available documentation right now are the comments in the -header file "gtk/gtkdatabox.h" and the examples in the folder -"examples". If that does not help, do not hesitate to contact me, flames -being accepted but not necessarily answered :-) +To install, please read the INSTALL file. ------------------------------------------------------------------- +Documentation is in the api/html directory. Look in the Files->Globals->functions for a list of the functions available. -Martinsried, Germany 2002-05-04 - -Roland Bock +Hope you enjoy using this code ... +The gtkdatabox team. 2012 \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/aclocal.m4 libgtkdatabox-0.9.2.0/aclocal.m4 --- libgtkdatabox-0.9.1.1/aclocal.m4 2009-05-11 00:57:44.000000000 +0000 +++ libgtkdatabox-0.9.2.0/aclocal.m4 2012-11-09 05:04:26.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -13,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -106,7 +107,7 @@ int major, minor, micro; char *tmp_version; - system ("touch conf.gtktest"); + fclose (fopen ("conf.gtktest", "w")); /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_gtk_version"); @@ -224,8 +225,15 @@ dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + dnl for overriding the documentation installation directory AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, @@ -244,22 +252,44 @@ [PKG_CHECK_EXISTS([gtk-doc],, AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) - AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -268,7 +298,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -295,7 +326,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -324,6 +355,7 @@ # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -340,6 +372,8 @@ AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -376,7 +410,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) @@ -396,6 +430,11 @@ m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -418,10 +457,13 @@ dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -437,7 +479,6 @@ _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -451,23 +492,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -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 delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -508,6 +532,28 @@ ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +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 delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -632,12 +678,12 @@ # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) # --------------------------------------------------- m4_define([lt_decl_varnames_tagged], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_quote(m4_if([$2], [], - m4_quote(lt_decl_tag_varnames), - m4_quote(m4_shift($@)))), - m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) -m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) @@ -660,7 +706,7 @@ # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -670,7 +716,7 @@ # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -769,12 +815,20 @@ LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -785,9 +839,9 @@ # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -795,16 +849,38 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -814,20 +890,11 @@ AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 +lt_cl_silent=false exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -853,7 +920,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -898,15 +965,13 @@ # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) ])# LT_OUTPUT @@ -969,15 +1034,12 @@ # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - _LT_PROG_XSI_SHELLFNS + _LT_PROG_REPLACE_SHELLFNS - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -1022,6 +1084,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1043,6 +1106,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1073,6 +1159,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1083,11 +1173,13 @@ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -1173,7 +1265,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1181,6 +1279,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1192,15 +1291,43 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on + darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? + # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -1219,7 +1346,7 @@ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1229,8 +1356,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1239,11 +1366,21 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then - output_verbose_link_cmd=echo + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1259,203 +1396,142 @@ fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # 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. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_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 "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`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 "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + # _LT_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. +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_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! - : +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' 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 <<_LT_EOF -[$]* -_LT_EOF - exit 0 + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -# 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 - -if test -z "$lt_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 && - { 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 +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} - 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 +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -AC_SUBST(lt_ECHO) -]) _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -1484,7 +1560,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext + echo '[#]line '$LINENO' "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 @@ -1577,14 +1653,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1602,14 +1691,47 @@ ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1628,18 +1750,27 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1664,15 +1795,15 @@ -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 echo "\"\$as_me:$LINENO: $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 + echo "$as_me:$LINENO: \$? = $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 + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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 @@ -1712,7 +1843,7 @@ 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 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1764,7 +1895,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # 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, @@ -1775,6 +1906,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + 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. @@ -1800,6 +1936,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -1839,8 +1980,8 @@ # 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. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1891,7 +2032,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" +[#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1932,11 +2073,13 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); #endif -void fnord() { int i=42;} +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1945,13 +2088,17 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else puts (dlerror ()); - exit (status); + return status; }] _LT_EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then @@ -1990,7 +2137,7 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; @@ -2121,16 +2268,16 @@ -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 echo "\"\$as_me:$LINENO: $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 + echo "$as_me:$LINENO: \$? = $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 + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2287,7 +2434,9 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2296,16 +2445,23 @@ 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 + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # 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. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # 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= @@ -2318,7 +2474,7 @@ 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 ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2338,7 +2494,13 @@ 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` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2364,7 +2526,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2373,7 +2535,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2426,7 +2588,7 @@ m68k) 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -2438,7 +2600,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -2451,14 +2613,15 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2479,36 +2642,83 @@ 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" +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; - mingw*) + mingw* | cegcc*) # 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 + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2529,7 +2739,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2537,10 +2747,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2548,7 +2754,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2566,7 +2772,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2586,12 +2792,26 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + 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=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2637,12 +2857,14 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2658,7 +2880,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2695,9 +2917,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2705,16 +2927,21 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -2723,7 +2950,7 @@ # 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>/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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -2767,7 +2994,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2836,7 +3063,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2861,7 +3088,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2885,7 +3112,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2916,17 +3143,17 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2943,7 +3170,7 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi - + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi @@ -2968,6 +3195,8 @@ The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -3080,6 +3309,7 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -3201,6 +3431,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -3209,8 +3444,8 @@ fi ;; esac -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_DECL([], [reload_cmds], [2])dnl +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3220,6 +3455,7 @@ # -- PORTME fill in with the dynamic library characteristics m4_defun([_LT_CHECK_MAGIC_METHOD], [m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -3261,15 +3497,23 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # 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 + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && 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)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -3294,6 +3538,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3302,11 +3550,11 @@ 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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? 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_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 @@ -3327,8 +3575,8 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3406,6 +3654,21 @@ ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + 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 @@ -3413,7 +3676,11 @@ _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3470,7 +3737,19 @@ NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3483,13 +3762,13 @@ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3504,6 +3783,67 @@ dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + # LT_LIB_M # -------- @@ -3512,7 +3852,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3540,7 +3880,12 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3557,6 +3902,7 @@ m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3581,7 +3927,7 @@ aix*) symcode='[[BCDT]]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) @@ -3624,8 +3970,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3649,6 +3995,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -3661,6 +4008,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3682,7 +4030,7 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3694,6 +4042,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -3705,7 +4065,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -3731,15 +4091,15 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_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" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3772,6 +4132,13 @@ AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3782,6 +4149,8 @@ _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3793,7 +4162,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3827,7 +4195,7 @@ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32* | cegcc*) # 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 @@ -3844,6 +4212,11 @@ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3854,10 +4227,11 @@ fi ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) ;; *) _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' @@ -3892,6 +4266,12 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # 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). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; dgux*) case $cc_basename in ec++*) @@ -3948,19 +4328,26 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc* | ecpc* ) - # Intel C++ + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgCC* | pgcpp*) # Portland Group C++ compiler _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -3974,8 +4361,8 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -4037,7 +4424,7 @@ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4126,7 +4513,7 @@ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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 @@ -4141,11 +4528,18 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) # +Z the default ;; *) @@ -4182,6 +4576,15 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -4195,7 +4598,7 @@ fi ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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). m4_if([$1], [GCJ], [], @@ -4224,14 +4627,34 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc* | ifort*) + # old Intel for x86_64 which still supported -KPIC. + ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4243,25 +4666,40 @@ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; esac ;; @@ -4293,7 +4731,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4350,9 +4788,11 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -4371,6 +4811,8 @@ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4391,6 +4833,7 @@ m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4399,30 +4842,40 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # 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 + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_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' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_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_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) _LT_TAGVAR(link_all_deplibs, $1)=no - ;; + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4437,7 +4890,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4467,7 +4919,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # 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++. @@ -4482,10 +4934,39 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4503,6 +4984,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[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 ... @@ -4518,11 +5000,12 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, 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. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -4554,14 +5037,16 @@ fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_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_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4579,6 +5064,11 @@ fi ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4594,7 +5084,7 @@ _LT_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' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4604,15 +5094,16 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_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' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_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' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4620,13 +5111,20 @@ tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_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' + _LT_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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4642,17 +5140,16 @@ fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_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~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4666,8 +5163,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4685,8 +5182,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4732,8 +5229,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4773,8 +5270,10 @@ 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 + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_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' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_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 @@ -4852,6 +5351,7 @@ fi fi + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes @@ -4861,9 +5361,9 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_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 "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -4872,14 +5372,19 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_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' @@ -4906,25 +5411,69 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # 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_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # 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_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_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' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -4937,10 +5486,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_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 @@ -4953,7 +5498,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -4962,7 +5507,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4970,7 +5515,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${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_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 @@ -4985,14 +5530,13 @@ ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5004,16 +5548,16 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -5025,7 +5569,14 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi @@ -5053,19 +5604,34 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -5127,17 +5693,17 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_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_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_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -5147,13 +5713,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5166,9 +5732,9 @@ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5344,36 +5910,38 @@ # 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* - echo "$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_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$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_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;; esac fi @@ -5410,9 +5978,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [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]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5438,8 +6003,6 @@ to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5450,6 +6013,8 @@ [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5539,37 +6104,22 @@ ])# _LT_LANG_C_CONFIG -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -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 -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - # _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write # the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +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 +else + _lt_caught_CXX_error=yes +fi AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5581,7 +6131,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5591,6 +6140,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5622,6 +6173,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5639,6 +6191,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5660,8 +6213,8 @@ # 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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_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_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5693,7 +6246,7 @@ # 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"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -5791,6 +6344,7 @@ fi fi + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. @@ -5801,10 +6355,10 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_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 "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5813,14 +6367,19 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -5849,29 +6408,76 @@ esac ;; - cygwin* | mingw* | pw32*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_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_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_TAGVAR(ld_shlibs, $1)=no - fi - ;; + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # 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_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_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_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_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -5894,7 +6500,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -5913,6 +6519,11 @@ gnu*) ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -5937,11 +6548,11 @@ # 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) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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_TAGVAR(ld_shlibs, $1)=no @@ -6002,7 +6613,7 @@ # 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 "X$list" | $Xsed' + 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; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -6012,10 +6623,10 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6045,7 +6656,7 @@ case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-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 @@ -6056,9 +6667,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6069,7 +6680,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6087,7 +6698,7 @@ # 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 "X$list" | $Xsed' + 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; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6124,26 +6735,26 @@ pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_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' ;; @@ -6151,7 +6762,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_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' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -6170,9 +6781,9 @@ # 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 "X$templist" | $Xsed -e "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 "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$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; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6192,13 +6803,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_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' + _LT_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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # 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' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6267,7 +6878,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6302,15 +6913,15 @@ case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6326,17 +6937,17 @@ # 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 "X$templist" | $Xsed -e "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 "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$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; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_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" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6346,7 +6957,7 @@ # 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"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6382,7 +6993,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6403,7 +7014,7 @@ esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6423,14 +7034,14 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_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' + $CC -shared $pic_flag -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"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6441,7 +7052,7 @@ # 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"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6495,6 +7106,10 @@ CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6550,6 +7165,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6564,6 +7180,29 @@ ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6572,6 +7211,7 @@ # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6621,7 +7261,20 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -6633,7 +7286,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -6642,13 +7295,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} 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. @@ -6668,8 +7330,10 @@ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -6705,6 +7369,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -6741,7 +7406,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -6785,32 +7450,16 @@ ])# _LT_SYS_HIDDEN_LIBDEPS -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6820,7 +7469,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6829,6 +7477,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6868,7 +7518,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6922,38 +7574,24 @@ GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP ])# _LT_LANG_F77_CONFIG -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6963,7 +7601,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6972,6 +7609,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -7011,7 +7650,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -7067,7 +7708,8 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -7104,10 +7746,12 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -7117,6 +7761,8 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds if test -n "$compiler"; then _LT_COMPILER_NO_RTTI($1) @@ -7132,10 +7778,78 @@ AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_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_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7167,9 +7881,11 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} +CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7182,7 +7898,8 @@ GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -7202,6 +7919,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7230,6 +7954,27 @@ ]) +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -7320,8 +8065,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7360,222 +8105,177 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi -_LT_EOF -esac +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac ]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # 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 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -7690,7 +8390,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -7698,13 +8398,13 @@ esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], @@ -7890,9 +8590,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -7931,14 +8646,14 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # # 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 ltsugar.m4 +# serial 6 ltsugar.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) @@ -7994,14 +8709,14 @@ # Produce a SEP delimited list of all paired combinations of elements of # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list # has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. m4_define([lt_combine], -[m4_if([$2], [], [], - [m4_if([$4], [], [], - [lt_join(m4_quote(m4_default([$1], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl -]) +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) @@ -8062,31 +8777,31 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 2976 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.4]) -m4_define([LT_PACKAGE_REVISION], [1.2976]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.4' -macro_revision='1.2976' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # 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 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -8156,7 +8871,6 @@ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -8169,8 +8883,16 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -8197,8 +8919,12 @@ # ---------------------------------- 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 +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -8211,7 +8937,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -8220,34 +8945,32 @@ # 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 +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have 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_default([$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 +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8289,16 +9012,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _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"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` 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 + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8306,44 +9030,46 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [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]) +To get pkg-config, see .])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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 1 + # 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' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8357,21 +9083,23 @@ # 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. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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 1 + # 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/../..'. @@ -8419,14 +9147,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # 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 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -8439,6 +9167,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -8452,14 +9181,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 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 +# serial 12 # 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, @@ -8499,6 +9228,7 @@ # 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'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -8516,6 +9246,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + 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 @@ -8533,7 +9273,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -8543,19 +9293,23 @@ break fi ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; 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} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj 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 && + grep $am__obj 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 @@ -8604,65 +9358,79 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # 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 +#serial 5 # _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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -8694,13 +9462,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 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 13 +# serial 16 # 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. @@ -8717,7 +9485,7 @@ # 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 +[AC_PREREQ([2.62])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 @@ -8768,8 +9536,8 @@ 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_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -8777,23 +9545,36 @@ 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([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 + [_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 + [_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 -]) -]) + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) # When config.status generates a header, we must update the stamp-h file. @@ -8817,18 +9598,28 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 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 1 + # 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"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -8854,13 +9645,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -8869,7 +9660,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -8879,24 +9670,24 @@ _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 +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # 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 + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -8906,14 +9697,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # 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 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -8930,7 +9721,14 @@ 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" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -8940,12 +9738,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 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 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -8968,13 +9769,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -8982,16 +9784,16 @@ [[_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)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -8999,16 +9801,35 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 2001, 2003, 2005, 2011 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 1 + +# 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 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # 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_SANITY_CHECK # --------------- @@ -9017,16 +9838,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # 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` + 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` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -9051,12 +9885,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -9079,21 +9915,28 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 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_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9115,10 +9958,11 @@ # 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]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru libgtkdatabox-0.9.1.1/api/html/annotated.html libgtkdatabox-0.9.2.0/api/html/annotated.html --- libgtkdatabox-0.9.1.1/api/html/annotated.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/annotated.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,170 @@ + + + + + +GtkDatabox: Data Structures + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
Data Structures
+
+
+
Here are the data structures with brief descriptions:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
_GtkDatabox
_GtkDataboxBars
_GtkDataboxBarsClass
_GtkDataboxBarsPrivate
_GtkDataboxClass
_GtkDataboxCrossSimple
_GtkDataboxCrossSimpleClass
_GtkDataboxGraph
_GtkDataboxGraphClass
_GtkDataboxGraphPrivate
_GtkDataboxGrid
_GtkDataboxGridClass
_GtkDataboxGridPrivate
_GtkDataboxLines
_GtkDataboxLinesClass
_GtkDataboxLinesPrivate
_GtkDataboxMarkers
_GtkDataboxMarkersClass
_GtkDataboxMarkersPrivate
_GtkDataboxOffsetBars
_GtkDataboxOffsetBarsClass
_GtkDataboxOffsetBarsPrivate
_GtkDataboxPoints
_GtkDataboxPointsClass
_GtkDataboxPointsPrivate
_GtkDataboxPrivate
_GtkDataboxRegions
_GtkDataboxRegionsClass
_GtkDataboxRegionsPrivate
_GtkDataboxRuler
_GtkDataboxRulerClass
_GtkDataboxRulerPrivate
_GtkDataboxXYCGraph
_GtkDataboxXYCGraphClass
_GtkDataboxXYCGraphPrivate
_GtkDataboxXYYCGraph
_GtkDataboxXYYCGraphClass
_GtkDataboxXYYCGraphPrivate
GtkDataboxMarkersInfo
GtkDataboxValueRectangle
+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/annotated.js libgtkdatabox-0.9.2.0/api/html/annotated.js --- libgtkdatabox-0.9.1.1/api/html/annotated.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/annotated.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,43 @@ +var annotated = +[ + [ "_GtkDatabox", "struct__GtkDatabox.html", "struct__GtkDatabox" ], + [ "_GtkDataboxBars", "struct__GtkDataboxBars.html", "struct__GtkDataboxBars" ], + [ "_GtkDataboxBarsClass", "struct__GtkDataboxBarsClass.html", "struct__GtkDataboxBarsClass" ], + [ "_GtkDataboxBarsPrivate", "struct__GtkDataboxBarsPrivate.html", "struct__GtkDataboxBarsPrivate" ], + [ "_GtkDataboxClass", "struct__GtkDataboxClass.html", "struct__GtkDataboxClass" ], + [ "_GtkDataboxCrossSimple", "struct__GtkDataboxCrossSimple.html", "struct__GtkDataboxCrossSimple" ], + [ "_GtkDataboxCrossSimpleClass", "struct__GtkDataboxCrossSimpleClass.html", "struct__GtkDataboxCrossSimpleClass" ], + [ "_GtkDataboxGraph", "struct__GtkDataboxGraph.html", "struct__GtkDataboxGraph" ], + [ "_GtkDataboxGraphClass", "struct__GtkDataboxGraphClass.html", "struct__GtkDataboxGraphClass" ], + [ "_GtkDataboxGraphPrivate", "struct__GtkDataboxGraphPrivate.html", "struct__GtkDataboxGraphPrivate" ], + [ "_GtkDataboxGrid", "struct__GtkDataboxGrid.html", "struct__GtkDataboxGrid" ], + [ "_GtkDataboxGridClass", "struct__GtkDataboxGridClass.html", "struct__GtkDataboxGridClass" ], + [ "_GtkDataboxGridPrivate", "struct__GtkDataboxGridPrivate.html", "struct__GtkDataboxGridPrivate" ], + [ "_GtkDataboxLines", "struct__GtkDataboxLines.html", "struct__GtkDataboxLines" ], + [ "_GtkDataboxLinesClass", "struct__GtkDataboxLinesClass.html", "struct__GtkDataboxLinesClass" ], + [ "_GtkDataboxLinesPrivate", "struct__GtkDataboxLinesPrivate.html", "struct__GtkDataboxLinesPrivate" ], + [ "_GtkDataboxMarkers", "struct__GtkDataboxMarkers.html", "struct__GtkDataboxMarkers" ], + [ "_GtkDataboxMarkersClass", "struct__GtkDataboxMarkersClass.html", "struct__GtkDataboxMarkersClass" ], + [ "_GtkDataboxMarkersPrivate", "struct__GtkDataboxMarkersPrivate.html", "struct__GtkDataboxMarkersPrivate" ], + [ "_GtkDataboxOffsetBars", "struct__GtkDataboxOffsetBars.html", "struct__GtkDataboxOffsetBars" ], + [ "_GtkDataboxOffsetBarsClass", "struct__GtkDataboxOffsetBarsClass.html", "struct__GtkDataboxOffsetBarsClass" ], + [ "_GtkDataboxOffsetBarsPrivate", "struct__GtkDataboxOffsetBarsPrivate.html", "struct__GtkDataboxOffsetBarsPrivate" ], + [ "_GtkDataboxPoints", "struct__GtkDataboxPoints.html", "struct__GtkDataboxPoints" ], + [ "_GtkDataboxPointsClass", "struct__GtkDataboxPointsClass.html", "struct__GtkDataboxPointsClass" ], + [ "_GtkDataboxPointsPrivate", "struct__GtkDataboxPointsPrivate.html", "struct__GtkDataboxPointsPrivate" ], + [ "_GtkDataboxPrivate", "struct__GtkDataboxPrivate.html", "struct__GtkDataboxPrivate" ], + [ "_GtkDataboxRegions", "struct__GtkDataboxRegions.html", "struct__GtkDataboxRegions" ], + [ "_GtkDataboxRegionsClass", "struct__GtkDataboxRegionsClass.html", "struct__GtkDataboxRegionsClass" ], + [ "_GtkDataboxRegionsPrivate", "struct__GtkDataboxRegionsPrivate.html", "struct__GtkDataboxRegionsPrivate" ], + [ "_GtkDataboxRuler", "struct__GtkDataboxRuler.html", "struct__GtkDataboxRuler" ], + [ "_GtkDataboxRulerClass", "struct__GtkDataboxRulerClass.html", "struct__GtkDataboxRulerClass" ], + [ "_GtkDataboxRulerPrivate", "struct__GtkDataboxRulerPrivate.html", "struct__GtkDataboxRulerPrivate" ], + [ "_GtkDataboxXYCGraph", "struct__GtkDataboxXYCGraph.html", "struct__GtkDataboxXYCGraph" ], + [ "_GtkDataboxXYCGraphClass", "struct__GtkDataboxXYCGraphClass.html", "struct__GtkDataboxXYCGraphClass" ], + [ "_GtkDataboxXYCGraphPrivate", "struct__GtkDataboxXYCGraphPrivate.html", "struct__GtkDataboxXYCGraphPrivate" ], + [ "_GtkDataboxXYYCGraph", "struct__GtkDataboxXYYCGraph.html", "struct__GtkDataboxXYYCGraph" ], + [ "_GtkDataboxXYYCGraphClass", "struct__GtkDataboxXYYCGraphClass.html", "struct__GtkDataboxXYYCGraphClass" ], + [ "_GtkDataboxXYYCGraphPrivate", "struct__GtkDataboxXYYCGraphPrivate.html", "struct__GtkDataboxXYYCGraphPrivate" ], + [ "GtkDataboxMarkersInfo", "structGtkDataboxMarkersInfo.html", "structGtkDataboxMarkersInfo" ], + [ "GtkDataboxValueRectangle", "structGtkDataboxValueRectangle.html", "structGtkDataboxValueRectangle" ] +]; \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/bc_s.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/bc_s.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/classes.html libgtkdatabox-0.9.2.0/api/html/classes.html --- libgtkdatabox-0.9.1.1/api/html/classes.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/classes.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,144 @@ + + + + + +GtkDatabox: Data Structure Index + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
Data Structure Index
+
+
+
G | _
+ + + + + + + + + + + +
  G  
+		_GtkDataboxBarsPrivate   _GtkDataboxGridPrivate   _GtkDataboxOffsetBarsPrivate   _GtkDataboxRulerClass   
_GtkDataboxClass   _GtkDataboxLines   _GtkDataboxPoints   _GtkDataboxRulerPrivate   
GtkDataboxMarkersInfo   _GtkDataboxCrossSimple   _GtkDataboxLinesClass   _GtkDataboxPointsClass   _GtkDataboxXYCGraph   
GtkDataboxValueRectangle   _GtkDataboxCrossSimpleClass   _GtkDataboxLinesPrivate   _GtkDataboxPointsPrivate   _GtkDataboxXYCGraphClass   
  _  
+		_GtkDataboxGraph   _GtkDataboxMarkers   _GtkDataboxPrivate   _GtkDataboxXYCGraphPrivate   
_GtkDataboxGraphClass   _GtkDataboxMarkersClass   _GtkDataboxRegions   _GtkDataboxXYYCGraph   
_GtkDatabox   _GtkDataboxGraphPrivate   _GtkDataboxMarkersPrivate   _GtkDataboxRegionsClass   _GtkDataboxXYYCGraphClass   
_GtkDataboxBars   _GtkDataboxGrid   _GtkDataboxOffsetBars   _GtkDataboxRegionsPrivate   _GtkDataboxXYYCGraphPrivate   
_GtkDataboxBarsClass   _GtkDataboxGridClass   _GtkDataboxOffsetBarsClass   _GtkDataboxRuler   
+
G | _
+
+ + + + +
+ +
+ +
+ + + + + Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/closed.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/closed.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/doxygen.css libgtkdatabox-0.9.2.0/api/html/doxygen.css --- libgtkdatabox-0.9.1.1/api/html/doxygen.css 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/doxygen.css 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,949 @@ +/* The standard CSS for doxygen */ + +body, table, div, p, dl { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; + font-size: 13px; + line-height: 1.3; +} + +/* @group Heading Levels */ + +h1 { + font-size: 150%; +} + +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd, p.starttd { + margin-top: 2px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + text-align: center; +} + +div.qindex, div.navtab{ + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; +} + +div.qindex, div.navpath { + width: 100%; + line-height: 140%; +} + +div.navtab { + margin-right: 15px; +} + +/* @group Link Styling */ + +a { + color: #3D578C; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #4665A2; +} + +a:hover { + text-decoration: underline; +} + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #9CAFD4; + color: #ffffff; + border: 1px double #869DCA; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code, a.code:visited { + color: #4665A2; +} + +a.codeRef, a.codeRef:visited { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +.fragment { + font-family: monospace, fixed; + font-size: 105%; +} + +pre.fragment { + border: 1px solid #C4CFE5; + background-color: #FBFCFD; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px; + padding: 0.2em; + border: solid thin #333; + border-radius: 0.5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; +} + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +body { + background-color: white; + color: black; + margin: 0; +} + +div.contents { + margin-top: 10px; + margin-left: 8px; + margin-right: 8px; +} + +td.indexkey { + background-color: #EBEFF6; + font-weight: bold; + border: 1px solid #C4CFE5; + margin: 2px 0px 2px 0; + padding: 2px 10px; + white-space: nowrap; + vertical-align: top; +} + +td.indexvalue { + background-color: #EBEFF6; + border: 1px solid #C4CFE5; + padding: 2px 10px; + margin: 2px 0px; +} + +tr.memlist { + background-color: #EEF1F7; +} + +p.formulaDsp { + text-align: center; +} + +img.formulaDsp { + +} + +img.formulaInl { + vertical-align: middle; +} + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +div.center img { + border: 0px; +} + +address.footer { + text-align: right; + padding-right: 12px; +} + +img.footer { + border: 0px; + vertical-align: middle; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +/* @end */ + +/* +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #e8eef2; +} +*/ + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #A3B4D7; +} + +th.dirtab { + background: #EBEFF6; + font-weight: bold; +} + +hr { + height: 0px; + border: none; + border-top: 1px solid #4A6AAA; +} + +hr.footer { + height: 1px; +} + +/* @group Member Descriptions */ + +table.memberdecls { + border-spacing: 0px; + padding: 0px; +} + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #F9FAFC; + border: none; + margin: 4px; + padding: 1px 0 0 8px; +} + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; +} + +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #C4CFE5; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memItemRight { + width: 100%; +} + +.memTemplParams { + color: #4665A2; + white-space: nowrap; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #4665A2; + font-weight: normal; + margin-left: 9px; +} + +.memnav { + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.mempage { + width: 100%; +} + +.memitem { + padding: 0; + margin-bottom: 10px; + margin-right: 5px; +} + +.memname { + white-space: nowrap; + font-weight: bold; + margin-left: 6px; +} + +.memproto, dl.reflist dt { + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 0px 6px 0px; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + /* opera specific markup */ + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-top-right-radius: 8px; + border-top-left-radius: 8px; + /* firefox specific markup */ + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + -moz-border-radius-topright: 8px; + -moz-border-radius-topleft: 8px; + /* webkit specific markup */ + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + +} + +.memdoc, dl.reflist dd { + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 2px 5px; + background-color: #FBFCFD; + border-top-width: 0; + /* opera specific markup */ + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + /* firefox specific markup */ + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); + /* webkit specific markup */ + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); +} + +dl.reflist dt { + padding: 5px; +} + +dl.reflist dd { + margin: 0px 0px 10px 0px; + padding: 5px; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #602020; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} + +.params, .retval, .exception, .tparams { + border-spacing: 6px 2px; +} + +.params .paramname, .retval .paramname { + font-weight: bold; + vertical-align: top; +} + +.params .paramtype { + font-style: italic; + vertical-align: top; +} + +.params .paramdir { + font-family: "courier new",courier,monospace; + vertical-align: top; +} + + + + +/* @end */ + +/* @group Directory (tree) */ + +/* for the tree view */ + +.ftvtree { + font-family: sans-serif; + margin: 0px; +} + +/* these are for tree view when used as main index */ + +.directory { + font-size: 9pt; + font-weight: bold; + margin: 5px; +} + +.directory h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +/* +The following two styles can be used to replace the root node title +with an image of your choice. Simply uncomment the next two styles, +specify the name of your image and be sure to set 'height' to the +proper pixel height of your image. +*/ + +/* +.directory h3.swap { + height: 61px; + background-repeat: no-repeat; + background-image: url("yourimage.gif"); +} +.directory h3.swap span { + display: none; +} +*/ + +.directory > h3 { + margin-top: 0; +} + +.directory p { + margin: 0px; + white-space: nowrap; +} + +.directory div { + display: none; + margin: 0px; +} + +.directory img { + vertical-align: -30%; +} + +/* these are for tree view when not used as main index */ + +.directory-alt { + font-size: 100%; + font-weight: bold; +} + +.directory-alt h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +.directory-alt > h3 { + margin-top: 0; +} + +.directory-alt p { + margin: 0px; + white-space: nowrap; +} + +.directory-alt div { + display: none; + margin: 0px; +} + +.directory-alt img { + vertical-align: -30%; +} + +/* @end */ + +div.dynheader { + margin-top: 8px; +} + +address { + font-style: normal; + color: #2A3D61; +} + +table.doxtable { + border-collapse:collapse; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #2D4068; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #374F7F; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; +} + +table.fieldtable { + width: 100%; + margin-bottom: 10px; + border: 1px solid #A8B8D9; + border-spacing: 0px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); +} + +.fieldtable td, .fieldtable th { + padding: 3px 7px 2px; +} + +.fieldtable td.fieldtype, .fieldtable td.fieldname { + white-space: nowrap; + border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + vertical-align: top; +} + +.fieldtable td.fielddoc { + border-bottom: 1px solid #A8B8D9; + width: 100%; +} + +.fieldtable tr:last-child td { + border-bottom: none; +} + +.fieldtable th { + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + font-size: 90%; + color: #253555; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px solid #A8B8D9; +} + + +.tabsearch { + top: 0px; + left: 10px; + height: 36px; + background-image: url('tab_b.png'); + z-index: 101; + overflow: hidden; + font-size: 13px; +} + +.navpath ul +{ + font-size: 11px; + background-image:url('tab_b.png'); + background-repeat:repeat-x; + height:30px; + line-height:30px; + color:#8AA0CC; + border:solid 1px #C2CDE4; + overflow:hidden; + margin:0px; + padding:0px; +} + +.navpath li +{ + list-style-type:none; + float:left; + padding-left:10px; + padding-right:15px; + background-image:url('bc_s.png'); + background-repeat:no-repeat; + background-position:right; + color:#364D7C; +} + +.navpath li.navelem a +{ + height:32px; + display:block; + text-decoration: none; + outline: none; +} + +.navpath li.navelem a:hover +{ + color:#6884BD; +} + +.navpath li.footer +{ + list-style-type:none; + float:right; + padding-left:10px; + padding-right:15px; + background-image:none; + background-repeat:no-repeat; + background-position:right; + color:#364D7C; + font-size: 8pt; +} + + +div.summary +{ + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right; +} + +div.summary a +{ + white-space: nowrap; +} + +div.ingroups +{ + margin-left: 5px; + font-size: 8pt; + padding-left: 5px; + width: 50%; + text-align: left; +} + +div.ingroups a +{ + white-space: nowrap; +} + +div.header +{ + background-image:url('nav_h.png'); + background-repeat:repeat-x; + background-color: #F9FAFC; + margin: 0px; + border-bottom: 1px solid #C4CFE5; +} + +div.headertitle +{ + padding: 5px 5px 5px 7px; +} + +dl +{ + padding: 0 0 0 10px; +} + +dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug +{ + border-left:4px solid; + padding: 0 0 0 6px; +} + +dl.note +{ + border-color: #D0C000; +} + +dl.warning, dl.attention +{ + border-color: #FF0000; +} + +dl.pre, dl.post, dl.invariant +{ + border-color: #00D000; +} + +dl.deprecated +{ + border-color: #505050; +} + +dl.todo +{ + border-color: #00C0E0; +} + +dl.test +{ + border-color: #3030E0; +} + +dl.bug +{ + border-color: #C08050; +} + +#projectlogo +{ + text-align: center; + vertical-align: bottom; + border-collapse: separate; +} + +#projectlogo img +{ + border: 0px none; +} + +#projectname +{ + font: 300% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 2px 0px; +} + +#projectbrief +{ + font: 120% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#projectnumber +{ + font: 50% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#titlearea +{ + padding: 0px; + margin: 0px; + width: 100%; + border-bottom: 1px solid #5373B4; +} + +.image +{ + text-align: center; +} + +.dotgraph +{ + text-align: center; +} + +.mscgraph +{ + text-align: center; +} + +.caption +{ + font-weight: bold; +} + +div.zoom +{ + border: 1px solid #90A5CE; +} + +dl.citelist { + margin-bottom:50px; +} + +dl.citelist dt { + color:#334975; + float:left; + font-weight:bold; + margin-right:10px; + padding:5px; +} + +dl.citelist dd { + margin:2px 0; + padding:5px 0; +} + +@media print +{ + #top { display: none; } + #side-nav { display: none; } + #nav-path { display: none; } + body { overflow:visible; } + h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } + .summary { display: none; } + .memitem { page-break-inside: avoid; } + #doc-content + { + margin-left:0 !important; + height:auto !important; + width:auto !important; + overflow:inherit; + display:inline; + } + pre.fragment + { + overflow: visible; + text-wrap: unrestricted; + white-space: -moz-pre-wrap; /* Moz */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* CSS3 */ + word-wrap: break-word; /* IE 5.5+ */ + } +} + Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/doxygen.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/doxygen.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/files.html libgtkdatabox-0.9.2.0/api/html/files.html --- libgtkdatabox-0.9.1.1/api/html/files.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/files.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,160 @@ + + + + + +GtkDatabox: File List + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
File List
+
+
+
Here is a list of all files with brief descriptions:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
gtk/gtkdatabox.c
gtk/gtkdatabox.h [code]
gtk/gtkdatabox_bars.c
gtk/gtkdatabox_bars.h [code]
gtk/gtkdatabox_cross_simple.c
gtk/gtkdatabox_cross_simple.h [code]
gtk/gtkdatabox_graph.c
gtk/gtkdatabox_graph.h [code]
gtk/gtkdatabox_grid.c
gtk/gtkdatabox_grid.h [code]
gtk/gtkdatabox_lines.c
gtk/gtkdatabox_lines.h [code]
gtk/gtkdatabox_markers.c
gtk/gtkdatabox_markers.h [code]
gtk/gtkdatabox_marshal.c
gtk/gtkdatabox_marshal.h [code]
gtk/gtkdatabox_offset_bars.c
gtk/gtkdatabox_offset_bars.h [code]
gtk/gtkdatabox_points.c
gtk/gtkdatabox_points.h [code]
gtk/gtkdatabox_regions.c
gtk/gtkdatabox_regions.h [code]
gtk/gtkdatabox_ruler.c
gtk/gtkdatabox_ruler.h [code]
gtk/gtkdatabox_scale.c
gtk/gtkdatabox_scale.h [code]
gtk/gtkdatabox_typedefs.h [code]
gtk/gtkdatabox_xyc_graph.c
gtk/gtkdatabox_xyc_graph.h [code]
gtk/gtkdatabox_xyyc_graph.c
gtk/gtkdatabox_xyyc_graph.h [code]
+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/files.js libgtkdatabox-0.9.2.0/api/html/files.js --- libgtkdatabox-0.9.1.1/api/html/files.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/files.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,34 @@ +var files = +[ + [ "gtk/gtkdatabox.c", "gtkdatabox_8c.html", "gtkdatabox_8c" ], + [ "gtk/gtkdatabox.h", "gtkdatabox_8h.html", "gtkdatabox_8h" ], + [ "gtk/gtkdatabox_bars.c", "gtkdatabox__bars_8c.html", "gtkdatabox__bars_8c" ], + [ "gtk/gtkdatabox_bars.h", "gtkdatabox__bars_8h.html", "gtkdatabox__bars_8h" ], + [ "gtk/gtkdatabox_cross_simple.c", "gtkdatabox__cross__simple_8c.html", "gtkdatabox__cross__simple_8c" ], + [ "gtk/gtkdatabox_cross_simple.h", "gtkdatabox__cross__simple_8h.html", "gtkdatabox__cross__simple_8h" ], + [ "gtk/gtkdatabox_graph.c", "gtkdatabox__graph_8c.html", "gtkdatabox__graph_8c" ], + [ "gtk/gtkdatabox_graph.h", "gtkdatabox__graph_8h.html", "gtkdatabox__graph_8h" ], + [ "gtk/gtkdatabox_grid.c", "gtkdatabox__grid_8c.html", "gtkdatabox__grid_8c" ], + [ "gtk/gtkdatabox_grid.h", "gtkdatabox__grid_8h.html", "gtkdatabox__grid_8h" ], + [ "gtk/gtkdatabox_lines.c", "gtkdatabox__lines_8c.html", "gtkdatabox__lines_8c" ], + [ "gtk/gtkdatabox_lines.h", "gtkdatabox__lines_8h.html", "gtkdatabox__lines_8h" ], + [ "gtk/gtkdatabox_markers.c", "gtkdatabox__markers_8c.html", "gtkdatabox__markers_8c" ], + [ "gtk/gtkdatabox_markers.h", "gtkdatabox__markers_8h.html", "gtkdatabox__markers_8h" ], + [ "gtk/gtkdatabox_marshal.c", "gtkdatabox__marshal_8c.html", "gtkdatabox__marshal_8c" ], + [ "gtk/gtkdatabox_marshal.h", "gtkdatabox__marshal_8h.html", "gtkdatabox__marshal_8h" ], + [ "gtk/gtkdatabox_offset_bars.c", "gtkdatabox__offset__bars_8c.html", "gtkdatabox__offset__bars_8c" ], + [ "gtk/gtkdatabox_offset_bars.h", "gtkdatabox__offset__bars_8h.html", "gtkdatabox__offset__bars_8h" ], + [ "gtk/gtkdatabox_points.c", "gtkdatabox__points_8c.html", "gtkdatabox__points_8c" ], + [ "gtk/gtkdatabox_points.h", "gtkdatabox__points_8h.html", "gtkdatabox__points_8h" ], + [ "gtk/gtkdatabox_regions.c", "gtkdatabox__regions_8c.html", "gtkdatabox__regions_8c" ], + [ "gtk/gtkdatabox_regions.h", "gtkdatabox__regions_8h.html", "gtkdatabox__regions_8h" ], + [ "gtk/gtkdatabox_ruler.c", "gtkdatabox__ruler_8c.html", "gtkdatabox__ruler_8c" ], + [ "gtk/gtkdatabox_ruler.h", "gtkdatabox__ruler_8h.html", "gtkdatabox__ruler_8h" ], + [ "gtk/gtkdatabox_scale.c", "gtkdatabox__scale_8c.html", "gtkdatabox__scale_8c" ], + [ "gtk/gtkdatabox_scale.h", "gtkdatabox__scale_8h.html", "gtkdatabox__scale_8h" ], + [ "gtk/gtkdatabox_typedefs.h", "gtkdatabox__typedefs_8h.html", "gtkdatabox__typedefs_8h" ], + [ "gtk/gtkdatabox_xyc_graph.c", "gtkdatabox__xyc__graph_8c.html", "gtkdatabox__xyc__graph_8c" ], + [ "gtk/gtkdatabox_xyc_graph.h", "gtkdatabox__xyc__graph_8h.html", "gtkdatabox__xyc__graph_8h" ], + [ "gtk/gtkdatabox_xyyc_graph.c", "gtkdatabox__xyyc__graph_8c.html", "gtkdatabox__xyyc__graph_8c" ], + [ "gtk/gtkdatabox_xyyc_graph.h", "gtkdatabox__xyyc__graph_8h.html", "gtkdatabox__xyyc__graph_8h" ] +]; \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2blank.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2blank.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2doc.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2doc.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2folderclosed.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2folderclosed.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2folderopen.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2folderopen.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2lastnode.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2lastnode.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2link.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2link.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2mlastnode.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2mlastnode.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2mnode.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2mnode.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2node.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2node.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2plastnode.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2plastnode.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2pnode.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2pnode.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2splitbar.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2splitbar.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/ftv2vertline.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/ftv2vertline.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/functions.html libgtkdatabox-0.9.2.0/api/html/functions.html --- libgtkdatabox-0.9.1.1/api/html/functions.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/functions.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,544 @@ + + + + + +GtkDatabox: Data Fields + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all struct and union fields with links to the structures/unions they belong to:
+ +

- a -

+ + +

- b -

+ + +

- c -

+ + +

- d -

+ + +

- e -

+ + +

- g -

+ + +

- h -

+ + +

- i -

+ + +

- l -

+ + +

- m -

+ + +

- o -

+ + +

- p -

+ + +

- r -

+ + +

- s -

+ + +

- t -

+ + +

- u -

+ + +

- v -

+ + +

- w -

+ + +

- x -

+ + +

- y -

+ + +

- z -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/functions_vars.html libgtkdatabox-0.9.2.0/api/html/functions_vars.html --- libgtkdatabox-0.9.1.1/api/html/functions_vars.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/functions_vars.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,544 @@ + + + + + +GtkDatabox: Data Fields - Variables + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+  + +

- a -

+ + +

- b -

+ + +

- c -

+ + +

- d -

+ + +

- e -

+ + +

- g -

+ + +

- h -

+ + +

- i -

+ + +

- l -

+ + +

- m -

+ + +

- o -

+ + +

- p -

+ + +

- r -

+ + +

- s -

+ + +

- t -

+ + +

- u -

+ + +

- v -

+ + +

- w -

+ + +

- x -

+ + +

- y -

+ + +

- z -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals.html libgtkdatabox-0.9.2.0/api/html/globals.html --- libgtkdatabox-0.9.1.1/api/html/globals.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- _ -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x61.html libgtkdatabox-0.9.2.0/api/html/globals_0x61.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x61.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x61.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,158 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- a -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x62.html libgtkdatabox-0.9.2.0/api/html/globals_0x62.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x62.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x62.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- b -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x65.html libgtkdatabox-0.9.2.0/api/html/globals_0x65.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x65.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x65.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,158 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- e -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x66.html libgtkdatabox-0.9.2.0/api/html/globals_0x66.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x66.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x66.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- f -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x67.html libgtkdatabox-0.9.2.0/api/html/globals_0x67.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x67.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x67.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,1166 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- g -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x6c.html libgtkdatabox-0.9.2.0/api/html/globals_0x6c.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x6c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x6c.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,164 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- l -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x70.html libgtkdatabox-0.9.2.0/api/html/globals_0x70.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x70.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x70.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,232 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- p -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x72.html libgtkdatabox-0.9.2.0/api/html/globals_0x72.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x72.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x72.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,164 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- r -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x73.html libgtkdatabox-0.9.2.0/api/html/globals_0x73.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x73.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x73.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,170 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- s -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_0x7a.html libgtkdatabox-0.9.2.0/api/html/globals_0x7a.html --- libgtkdatabox-0.9.1.1/api/html/globals_0x7a.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_0x7a.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+
Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
+ +

- z -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_defs.html libgtkdatabox-0.9.2.0/api/html/globals_defs.html --- libgtkdatabox-0.9.1.1/api/html/globals_defs.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_defs.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,477 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+  + +

- _ -

+ + +

- f -

+ + +

- g -

+ + +

- l -

+ + +

- r -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_dup.js libgtkdatabox-0.9.2.0/api/html/globals_dup.js --- libgtkdatabox-0.9.1.1/api/html/globals_dup.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_dup.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var globals_dup = +[ + [ "_", "globals.html", null ], + [ "a", "globals_0x61.html", null ], + [ "b", "globals_0x62.html", null ], + [ "e", "globals_0x65.html", null ], + [ "f", "globals_0x66.html", null ], + [ "g", "globals_0x67.html", null ], + [ "l", "globals_0x6c.html", null ], + [ "p", "globals_0x70.html", null ], + [ "r", "globals_0x72.html", null ], + [ "s", "globals_0x73.html", null ], + [ "z", "globals_0x7a.html", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_enum.html libgtkdatabox-0.9.2.0/api/html/globals_enum.html --- libgtkdatabox-0.9.1.1/api/html/globals_enum.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_enum.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,147 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + +
+
+ +
+
+
+ +
+
+  +
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_eval.html libgtkdatabox-0.9.2.0/api/html/globals_eval.html --- libgtkdatabox-0.9.1.1/api/html/globals_eval.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_eval.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,394 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+  + +

- a -

+ + +

- b -

+ + +

- e -

+ + +

- g -

+ + +

- l -

+ + +

- p -

+ + +

- r -

+ + +

- s -

+ + +

- z -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_func.html libgtkdatabox-0.9.2.0/api/html/globals_func.html --- libgtkdatabox-0.9.1.1/api/html/globals_func.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_func.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,646 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+  + +

- g -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_func.js libgtkdatabox-0.9.2.0/api/html/globals_func.js --- libgtkdatabox-0.9.1.1/api/html/globals_func.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_func.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var globals_func = +[ + [ "g", "globals_func.html", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/globals_type.html libgtkdatabox-0.9.2.0/api/html/globals_type.html --- libgtkdatabox-0.9.1.1/api/html/globals_type.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/globals_type.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,259 @@ + + + + + +GtkDatabox: Globals + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+
+  + +

- g -

+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/graph_legend.html libgtkdatabox-0.9.2.0/api/html/graph_legend.html --- libgtkdatabox-0.9.1.1/api/html/graph_legend.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/graph_legend.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,185 @@ + + + + + +GtkDatabox: Graph Legend + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + +
+
+ +
+
+
+ +
+
+
+
Graph Legend
+
+
+

This page explains how to interpret the graphs that are generated by doxygen.

+

Consider the following example:

+
/*! Invisible class because of truncation */
+class Invisible { };
+
+/*! Truncated class, inheritance relation is hidden */
+class Truncated : public Invisible { };
+
+/* Class not documented with doxygen comments */
+class Undocumented { };
+
+/*! Class that is inherited using public inheritance */
+class PublicBase : public Truncated { };
+
+/*! A template class */
+template<class T> class Templ { };
+
+/*! Class that is inherited using protected inheritance */
+class ProtectedBase { };
+
+/*! Class that is inherited using private inheritance */
+class PrivateBase { };
+
+/*! Class that is used by the Inherited class */
+class Used { };
+
+/*! Super class that inherits a number of other classes */
+class Inherited : public PublicBase,
+                  protected ProtectedBase,
+                  private PrivateBase,
+                  public Undocumented,
+                  public Templ<int>
+{
+  private:
+    Used *m_usedClass;
+};
+

This will result in the following graph:

+
+ +
+

The boxes in the above graph have the following meaning:

+
    +
  • +A filled gray box represents the struct or class for which the graph is generated.
    • +
  • +A box with a black border denotes a documented struct or class.
    • +
  • +A box with a grey border denotes an undocumented struct or class.
    • +
  • +A box with a red border denotes a documented struct or class forwhich not all inheritance/containment relations are shown. A graph is truncated if it does not fit within the specified boundaries.
    • +
+

The arrows have the following meaning:

+
    +
  • +A dark blue arrow is used to visualize a public inheritance relation between two classes.
    • +
  • +A dark green arrow is used for protected inheritance.
    • +
  • +A dark red arrow is used for private inheritance.
    • +
  • +A purple dashed arrow is used if a class is contained or used by another class. The arrow is labeled with the variable(s) through which the pointed class or struct is accessible.
    • +
  • +A yellow dashed arrow denotes a relation between a template instance and the template class it was instantiated from. The arrow is labeled with the template parameters of the instance.
    • +
+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/graph_legend.md5 libgtkdatabox-0.9.2.0/api/html/graph_legend.md5 --- libgtkdatabox-0.9.1.1/api/html/graph_legend.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/graph_legend.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +70d597617e34367275a35eeb8fb7ea07 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/graph_legend.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/graph_legend.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c.html 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,1675 @@ + + + + + +GtkDatabox: gtk/gtkdatabox.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Enumerations | +Functions
+
+
gtk/gtkdatabox.c File Reference
+
+
+
#include <gtkdatabox.h>
+#include <gtkdatabox_marshal.h>
+#include <gtk/gtkhscrollbar.h>
+#include <gtk/gtkvscrollbar.h>
+#include <gtkdatabox_ruler.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtkgc.h>
+#include <math.h>
+
+Include dependency graph for gtkdatabox.c:
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxPrivate

+Enumerations

enum  {
+  ZOOMED_SIGNAL, +SELECTION_STARTED_SIGNAL, +SELECTION_CHANGED_SIGNAL, +SELECTION_FINALIZED_SIGNAL, +
+  SELECTION_CANCELED_SIGNAL, +LAST_SIGNAL +
+ }
enum  {
+  ENABLE_SELECTION = 1, +ENABLE_ZOOM, +ADJUSTMENT_X, +ADJUSTMENT_Y, +
+  RULER_X, +RULER_Y, +SCALE_TYPE_X, +SCALE_TYPE_Y, +
+  BOX_SHADOW, +LAST_PROPERTY +
+ }

+Functions

GtkWidget * gtk_databox_new (void)
void gtk_databox_set_enable_selection (GtkDatabox *box, gboolean enable)
void gtk_databox_set_enable_zoom (GtkDatabox *box, gboolean enable)
void gtk_databox_set_adjustment_x (GtkDatabox *box, GtkAdjustment *adj)
void gtk_databox_set_adjustment_y (GtkDatabox *box, GtkAdjustment *adj)
void gtk_databox_set_ruler_x (GtkDatabox *box, GtkDataboxRuler *ruler)
void gtk_databox_set_ruler_y (GtkDatabox *box, GtkDataboxRuler *ruler)
void gtk_databox_set_scale_type_x (GtkDatabox *box, GtkDataboxScaleType scale_type)
void gtk_databox_set_scale_type_y (GtkDatabox *box, GtkDataboxScaleType scale_type)
void gtk_databox_set_box_shadow (GtkDatabox *box, GtkShadowType which_shadow)
gboolean gtk_databox_get_enable_selection (GtkDatabox *box)
gboolean gtk_databox_get_enable_zoom (GtkDatabox *box)
GtkAdjustment * gtk_databox_get_adjustment_x (GtkDatabox *box)
GtkAdjustment * gtk_databox_get_adjustment_y (GtkDatabox *box)
GtkDataboxRuler * gtk_databox_get_ruler_x (GtkDatabox *box)
GtkDataboxRuler * gtk_databox_get_ruler_y (GtkDatabox *box)
GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox *box)
GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox *box)
GtkShadowType gtk_databox_get_box_shadow (GtkDatabox *box)
GdkPixmap * gtk_databox_get_backing_pixmap (GtkDatabox *box)
void gtk_databox_zoom_to_selection (GtkDatabox *box)
void gtk_databox_zoom_out (GtkDatabox *box)
void gtk_databox_zoom_home (GtkDatabox *box)
gint gtk_databox_auto_rescale (GtkDatabox *box, gfloat border)
gint gtk_databox_calculate_extrema (GtkDatabox *box, gfloat *min_x, gfloat *max_x, gfloat *min_y, gfloat *max_y)
void gtk_databox_set_total_limits (GtkDatabox *box, gfloat left, gfloat right, gfloat top, gfloat bottom)
void gtk_databox_set_visible_limits (GtkDatabox *box, gfloat left, gfloat right, gfloat top, gfloat bottom)
void gtk_databox_get_total_limits (GtkDatabox *box, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom)
void gtk_databox_get_visible_limits (GtkDatabox *box, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom)
gint gtk_databox_graph_add (GtkDatabox *box, GtkDataboxGraph *graph)
gint gtk_databox_graph_add_front (GtkDatabox *box, GtkDataboxGraph *graph)
gint gtk_databox_graph_remove (GtkDatabox *box, GtkDataboxGraph *graph)
gint gtk_databox_graph_remove_all (GtkDatabox *box)
void gtk_databox_values_to_pixels (GtkDatabox *box, guint len, const gfloat *values_x, const gfloat *values_y, GdkPoint *pixels)
gint16 gtk_databox_value_to_pixel_x (GtkDatabox *box, gfloat value)
gint16 gtk_databox_value_to_pixel_y (GtkDatabox *box, gfloat value)
gfloat gtk_databox_pixel_to_value_x (GtkDatabox *box, gint16 pixel)
gfloat gtk_databox_pixel_to_value_y (GtkDatabox *box, gint16 pixel)
void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget **p_box, GtkWidget **p_table, gboolean scrollbar_x, gboolean scrollbar_y, gboolean ruler_x, gboolean ruler_y)
void gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget **p_box, GtkWidget **p_table, gboolean scrollbar_x, gboolean scrollbar_y, gboolean ruler_x, gboolean ruler_y, gboolean ruler_x_top, gboolean ruler_y_left)
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + + + + +
ZOOMED_SIGNAL  +
SELECTION_STARTED_SIGNAL  +
SELECTION_CHANGED_SIGNAL  +
SELECTION_FINALIZED_SIGNAL  +
SELECTION_CANCELED_SIGNAL  +
LAST_SIGNAL  +
+
+
+ +
+
+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + + + + + + + + +
ENABLE_SELECTION  +
ENABLE_ZOOM  +
ADJUSTMENT_X  +
ADJUSTMENT_Y  +
RULER_X  +
RULER_Y  +
SCALE_TYPE_X  +
SCALE_TYPE_Y  +
BOX_SHADOW  +
LAST_PROPERTY  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_auto_rescale (GtkDatabox * box,
gfloat border 
)
+
+
+

gtk_databox_auto_rescale: : A GtkDatabox widget : Relative border width (e.g. 0.1 means that the border on each side is 10% of the data area).

+

This function is similar to gtk_databox_set_total_limits(). It sets the total limits to match the data extrema (see gtk_databox_calculate_extrema()). If you do not like data pixels exactly at the widget's border, you can add modify the limits using the border parameter: The limits are extended by *(max-min) if max!=min. If max==min, they are extended by *max (otherwise the data could not be scaled to the pixel realm).

+

After calling this function, x values grow from left to right, y values grow from bottom to top.

+

Return value: 0 on success, -1 if is no GtkDatabox widget, -2 if no datasets are available

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
gint gtk_databox_calculate_extrema (GtkDatabox * box,
gfloat * min_x,
gfloat * max_x,
gfloat * min_y,
gfloat * max_y 
)
+
+
+

gtk_databox_calculate_extrema: : A GtkDatabox widget : Will be filled with the lowest x value of all datasets : Will be filled with the highest x value of all datasets : Will be filled with the lowest y value of all datasets : Will be filled with the highest y value of all datasets

+

Determines the minimum and maximum x and y values of all GtkDataboxGraph objects which have been added to the GtkDatabox widget via gtk_databox_graph_add().

+

Return value: 0 on success, -1 if is no GtkDatabox widget, -2 if no datasets are available

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget ** p_box,
GtkWidget ** p_table,
gboolean scrollbar_x,
gboolean scrollbar_y,
gboolean ruler_x,
gboolean ruler_y 
)
+
+
+

gtk_databox_create_box_with_scrollbars_and_rulers: : Will contain a pointer to a GtkDatabox widget : Will contain a pointer to a #GtkTable widget : Whether to attach a horizontal scrollbar : Whether to attach a vertical scrollbar : Whether to attach a horizontal ruler : Whether to attach a vertical ruler

+

This is a convenience function which creates a GtkDatabox widget in a GtkTable widget optionally accompanied by scrollbars and rulers. You only have to fill in the data (gtk_databox_graph_add()) and adjust the limits (gtk_databox_set_total_limits() or gtk_databox_auto_rescale()).

+

This function produces the default databox with rulers at the top left and scroll bars at the bottom right.

+

: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y()

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget ** p_box,
GtkWidget ** p_table,
gboolean scrollbar_x,
gboolean scrollbar_y,
gboolean ruler_x,
gboolean ruler_y,
gboolean ruler_x_top,
gboolean ruler_y_left 
)
+
+
+

gtk_databox_create_box_with_scrollbars_and_rulers_positioned: : Will contain a pointer to a GtkDatabox widget : Will contain a pointer to a #GtkTable widget : Whether to attach a horizontal scrollbar : Whether to attach a vertical scrollbar : Whether to attach a horizontal ruler : Whether to attach a vertical ruler : Whether to put the ruler_x up the top : Whether to put the ruler_y on the left

+

This is a convenience function which creates a GtkDatabox widget in a GtkTable widget optionally accompanied by scrollbars and rulers. You only have to fill in the data (gtk_databox_graph_add()) and adjust the limits (gtk_databox_set_total_limits() or gtk_databox_auto_rescale()).

+

This function produces the default databox with rulers at the top left and scroll bars at the bottom right.

+

: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y(), gtk_databox_create_box_with_scrollbars_and_rulers()

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + +
GtkAdjustment* gtk_databox_get_adjustment_x (GtkDatabox * box)
+
+
+

gtk_databox_get_adjustment_x : A GtkDatabox widget.

+

Getter function for the GtkDatabox:adjustment-x property.

+

Return value: The GtkDatabox:adjustment-x property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkAdjustment* gtk_databox_get_adjustment_y (GtkDatabox * box)
+
+
+

gtk_databox_get_adjustment_y : A GtkDatabox widget.

+

Getter function for the GtkDatabox:adjustment-y property.

+

Return value: The GtkDatabox:adjustment-y property value.

+ +
+
+ +
+
+ + + + + + + + +
GdkPixmap* gtk_databox_get_backing_pixmap (GtkDatabox * box)
+
+
+

gtk_databox_get_backing_pixmap: : A GtkDatabox widget

+

This function returns the pixmap which is used by and its GtkDataboxGraph objects for drawing operations before copying the result to the screen.

+

The function is typically called by the GtkDataboxGraph objects.

+

Return value: Backing pixmap

+ +
+
+ +
+
+ + + + + + + + +
GtkShadowType gtk_databox_get_box_shadow (GtkDatabox * box)
+
+
+

gtk_databox_get_box_shadow: : a GtkDatabox widget

+

Gets the type of shadow being rendered to the (GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT).

+

Return value: The currently used shadow type of the , -1 on failure.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_get_enable_selection (GtkDatabox * box)
+
+
+

gtk_databox_get_enable_selection : A GtkDatabox widget.

+

Getter function for the GtkDatabox:enable-selection property.

+

Return value: The GtkDatabox:enable-selection property value.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_get_enable_zoom (GtkDatabox * box)
+
+
+

gtk_databox_get_enable_zoom : A GtkDatabox widget.

+

Getter function for the GtkDatabox:enable-zoom property.

+

Return value: The GtkDatabox:enable-zoom property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxRuler* gtk_databox_get_ruler_x (GtkDatabox * box)
+
+
+

gtk_databox_get_ruler_x : A GtkDatabox widget.

+

Getter function for the GtkDatabox:ruler-x property.

+

Return value: The GtkDatabox:ruler-x property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxRuler* gtk_databox_get_ruler_y (GtkDatabox * box)
+
+
+

gtk_databox_get_ruler_y : A GtkDatabox widget.

+

Getter function for the GtkDatabox:ruler-y property.

+

Return value: The GtkDatabox:ruler-y property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox * box)
+
+
+

gtk_databox_get_scale_type_x : A GtkDatabox widget.

+

Getter function for the GtkDatabox:scale-type-x property.

+

Return value: The GtkDatabox:scale-type-x property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox * box)
+
+
+

gtk_databox_get_scale_type_y : A GtkDatabox widget.

+

Getter function for the GtkDatabox:scale-type-y property.

+

Return value: The GtkDatabox:scale-type-y property value.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_get_total_limits (GtkDatabox * box,
gfloat * left,
gfloat * right,
gfloat * top,
gfloat * bottom 
)
+
+
+

gtk_databox_get_total_limits: : A GtkDatabox widget : Space for total left value or #NULL : Space for total right value or #NULL : Space for total top value or #NULL : Space for total bottom value or #NULL

+

Gives the total limits (as set by gtk_databox_auto_rescale() or gtk_databox_set_total_limits()).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_get_visible_limits (GtkDatabox * box,
gfloat * left,
gfloat * right,
gfloat * top,
gfloat * bottom 
)
+
+
+

gtk_databox_get_visible_limits: : A GtkDatabox widget : Space for visible left value or #NULL : Space for visible right value or #NULL : Space for visible top value or #NULL : Space for visible bottom value or #NULL

+

Gives the current visible limits. These differ from those given by gtk_databox_get_total_limits() if you zoomed into the data for instance by gtk_databox_zoom_to_selection() or gtk_databox_set_visible_limits() (these values can be changed by scrolling, of course).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_add (GtkDatabox * box,
GtkDataboxGraph * graph 
)
+
+
+

gtk_databox_graph_add: : A GtkDatabox widget : A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object

+

Adds the to the . The next time the is re-drawn, the graph will be shown.

+

It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()).

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_add_front (GtkDatabox * box,
GtkDataboxGraph * graph 
)
+
+
+

gtk_databox_graph_add_front: : A GtkDatabox widget : A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object

+

Adds the to the and will be plotted on top. The next time the is re-drawn, the graph will be shown.

+

It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()).

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_remove (GtkDatabox * box,
GtkDataboxGraph * graph 
)
+
+
+

gtk_databox_graph_remove: : A GtkDatabox widget : A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object

+

Removes the from the once. The next time the is re-drawn, the graph will not be shown (unless it was added more than once).

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_graph_remove_all (GtkDatabox * box)
+
+
+

gtk_databox_graph_remove_all: : A GtkDatabox widget

+

Removes all graphs from the . The next time the is re-drawn, no graphs will be shown.

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + +
GtkWidget* gtk_databox_new (void )
+
+
+

gtk_databox_new

+

Creates a new GtkDatabox widget.

+

Return value: The new GtkDatabox widget.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gfloat gtk_databox_pixel_to_value_x (GtkDatabox * box,
gint16 pixel 
)
+
+
+

gtk_databox_pixel_to_value_x: : A GtkDatabox widget : A horizontal pixel coordinate

+

Calculates the x value which is represented by the horizontal coordinate. Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: x value

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gfloat gtk_databox_pixel_to_value_y (GtkDatabox * box,
gint16 pixel 
)
+
+
+

gtk_databox_pixel_to_value_y: : A GtkDatabox widget : A vertical pixel coordinate

+

Calculates the y value which is represented by the vertical coordinate. Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: y value

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_adjustment_x (GtkDatabox * box,
GtkAdjustment * adj 
)
+
+
+

gtk_databox_set_adjustment_x : A GtkDatabox widget : A #GtkAdjustment object

+

Setter function for the GtkDatabox:adjustment-x property. Normally, it should not be required to use this function, see property documentation.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_adjustment_y (GtkDatabox * box,
GtkAdjustment * adj 
)
+
+
+

gtk_databox_set_adjustment_y : A GtkDatabox widget : A #GtkAdjustment object

+

Setter function for the GtkDatabox:adjustment-y property. Normally, it should not be required to use this function, see property documentation.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_box_shadow (GtkDatabox * box,
GtkShadowType which_shadow 
)
+
+
+

gtk_databox_set_box_shadow: : a GtkDatabox widget. : How to render the box shadow on the GtkDatabox edges.

+

Sets the shadow type when using gtk_paint_box. This will draw the desired edge shadow.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_enable_selection (GtkDatabox * box,
gboolean enable 
)
+
+
+

gtk_databox_set_enable_selection : A GtkDatabox widget : Whether selection via mouse is enabled or not.

+

Setter function for the GtkDatabox:enable-selection property.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_enable_zoom (GtkDatabox * box,
gboolean enable 
)
+
+
+

gtk_databox_set_enable_zoom : A GtkDatabox widget : Whether zoom via mouse is enabled or not.

+

Setter function for the GtkDatabox:enable-zoom property.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_ruler_x (GtkDatabox * box,
GtkDataboxRuler * ruler 
)
+
+
+

gtk_databox_set_ruler_x : A GtkDatabox widget : A GtkDataboxRuler object

+

Setter function for the GtkDatabox:ruler-x property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_ruler_y (GtkDatabox * box,
GtkDataboxRuler * ruler 
)
+
+
+

gtk_databox_set_ruler_y : A GtkDatabox widget : An GtkDataboxRuler object

+

Setter function for the GtkDatabox:ruler-y property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_scale_type_x (GtkDatabox * box,
GtkDataboxScaleType scale_type 
)
+
+
+

gtk_databox_set_scale_type_x : A GtkDatabox widget : An GtkDataboxScaleType (linear or logarithmic)

+

Setter function for the GtkDatabox:scale-type-x property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_scale_type_y (GtkDatabox * box,
GtkDataboxScaleType scale_type 
)
+
+
+

gtk_databox_set_scale_type_y : A GtkDatabox widget : An GtkDataboxScaleType (linear or logarithmic)

+

Setter function for the GtkDatabox:scale-type-y property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_set_total_limits (GtkDatabox * box,
gfloat left,
gfloat right,
gfloat top,
gfloat bottom 
)
+
+
+

gtk_databox_set_total_limits: : A GtkDatabox widget : Left total limit : Right total limit : Top total limit : Bottom total limit

+

This function is used to set the limits of the total display area of . This function can be used to invert the orientation of the displayed graphs, e.g. =-1000 and =0.

+

Side effect: The also internally calls gtk_databox_set_visible_limits() with the same values.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_set_visible_limits (GtkDatabox * box,
gfloat left,
gfloat right,
gfloat top,
gfloat bottom 
)
+
+
+

gtk_databox_set_visible_limits: : A GtkDatabox widget : Left visible limit : Right visible limit : Top visible limit : Bottom visible limit

+

This function is used to set the limits of the visible display area of . The visible display area can be section of the total area, i.e. the zooms in, showing only a part of the complete picture.

+

The orientation of the values have to be the same as in gtk_databox_set_total_limits() and the visible limits have to be within the total limits. The values will not be used otherwise.

+

Side effect: The emits #GtkDatabox::zoomed.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint16 gtk_databox_value_to_pixel_x (GtkDatabox * box,
gfloat value 
)
+
+
+

gtk_databox_value_to_pixel_x: : A GtkDatabox widget : An x value

+

Calculates the horizontal pixel coordinate which represents the x . Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: Pixel coordinate

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint16 gtk_databox_value_to_pixel_y (GtkDatabox * box,
gfloat value 
)
+
+
+

gtk_databox_value_to_pixel_y: : A GtkDatabox widget : A y value

+

Calculates the vertical pixel coordinate which represents the y . Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: Pixel coordinate

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_values_to_pixels (GtkDatabox * box,
guint len,
const gfloat * values_x,
const gfloat * values_y,
GdkPoint * pixels 
)
+
+
+

gtk_databox_values_to_pixels: : A GtkDatabox widget : Number of values/pixels : Array of X values (length >= len) : Array of Y values (length >= len) : Array of pixel coordinates (length >= len)

+

Calculates the pixel equivalents of the given X/Y values and stores them in the array.

+ +
+
+ +
+
+ + + + + + + + +
void gtk_databox_zoom_home (GtkDatabox * box)
+
+
+

gtk_databox_zoom_home: : A GtkDatabox widget

+

This is equivalent to shift right-clicking into the .

+

This function works, if the attribute #enable-zoom is set to #TRUE. It is equivalent to calling the gtk_databox_set_visible_limits() with the total limits.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + +
void gtk_databox_zoom_out (GtkDatabox * box)
+
+
+

gtk_databox_zoom_out: : A GtkDatabox widget

+

This is equivalent to right-clicking into the .

+

This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function then zooms out by a factor of 2 in both dimensions (the maximum is defined by the total limits, see gtk_databox_set_total_limits()).

+

Side effect: The emits #GtkDatabox::zoomed.

+ +
+
+ +
+
+ + + + + + + + +
void gtk_databox_zoom_to_selection (GtkDatabox * box)
+
+
+

gtk_databox_zoom_to_selection: : A GtkDatabox widget

+

This is equivalent to left-clicking into the selected area.

+

This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function then zooms to the area selected with the mouse.

+

Side effect: The emits #GtkDatabox::zoomed.

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,69 @@ +var gtkdatabox_8c = +[ + [ "gtk_databox_adjustment_value_changed", "gtkdatabox_8c.html#a80b7a1a60f0b26e3f94e657229ea7aa1", null ], + [ "gtk_databox_auto_rescale", "gtkdatabox_8c.html#a4c920250dd54fb417154b513a5597083", null ], + [ "gtk_databox_button_press", "gtkdatabox_8c.html#a90cd3719f6373cb167dfc2ce4241e95e", null ], + [ "gtk_databox_button_release", "gtkdatabox_8c.html#a3b5af0932f81d351fcf6e22489453de8", null ], + [ "gtk_databox_calculate_extrema", "gtkdatabox_8c.html#aebe5c38bf9f4c8a91499b684cb600301", null ], + [ "gtk_databox_calculate_selection_values", "gtkdatabox_8c.html#a3f1e235498fa78b078db112fa7ef2c92", null ], + [ "gtk_databox_calculate_translation_factors", "gtkdatabox_8c.html#a7409916b1ebc4ec66f88b0fda64174ba", null ], + [ "gtk_databox_calculate_visible_limits", "gtkdatabox_8c.html#af0f101b43154d4054121b6a44bc9460b", null ], + [ "gtk_databox_class_init", "gtkdatabox_8c.html#a6b81ad0a7157ba47286dbfcc7a8faf70", null ], + [ "gtk_databox_create_backing_pixmap", "gtkdatabox_8c.html#a37031f5ce26a707b6450b5c74fe7d86b", null ], + [ "gtk_databox_create_box_with_scrollbars_and_rulers", "gtkdatabox_8c.html#a4ec019fb9c9522331a249b7a5cd7a2c9", null ], + [ "gtk_databox_create_box_with_scrollbars_and_rulers_positioned", "gtkdatabox_8c.html#afa49483edcb8f3558b811d362b2f136c", null ], + [ "gtk_databox_draw_selection", "gtkdatabox_8c.html#a6203db460fe71933b232878c2f83b54c", null ], + [ "gtk_databox_expose", "gtkdatabox_8c.html#a35ea84a7a92cd63c5e762d31dcb5017b", null ], + [ "gtk_databox_get_adjustment_x", "gtkdatabox_8c.html#a83a9ff9f95114b50b77af27ed89eed03", null ], + [ "gtk_databox_get_adjustment_y", "gtkdatabox_8c.html#a46eb687d25d1a4e9a477205b06680add", null ], + [ "gtk_databox_get_backing_pixmap", "gtkdatabox_8c.html#a4b4c9464145f3e49757a0b1c0c5459e4", null ], + [ "gtk_databox_get_box_shadow", "gtkdatabox_8c.html#a3f26030b6078131e7f9acd70d39e51e4", null ], + [ "gtk_databox_get_enable_selection", "gtkdatabox_8c.html#adf14dcd39ad139fdac6196bc79273c0c", null ], + [ "gtk_databox_get_enable_zoom", "gtkdatabox_8c.html#afd6a2b050e00f804f0d473eb8c9ea518", null ], + [ "gtk_databox_get_offset_x", "gtkdatabox_8c.html#aa9de924ffabcd40fbd4ad5bc3d5dab0c", null ], + [ "gtk_databox_get_offset_y", "gtkdatabox_8c.html#a23b80182c75cba14f82908f89d661ef0", null ], + [ "gtk_databox_get_page_size_x", "gtkdatabox_8c.html#a90aeb7ab93dffe4c2947ae74dfde8798", null ], + [ "gtk_databox_get_page_size_y", "gtkdatabox_8c.html#aa706db9e892a1b84e9f154af47866b85", null ], + [ "gtk_databox_get_property", "gtkdatabox_8c.html#abcdc31a7af885fec04d30dbbe54586dc", null ], + [ "gtk_databox_get_ruler_x", "gtkdatabox_8c.html#a21a1d0082f412eb0131aea7d643e7a7e", null ], + [ "gtk_databox_get_ruler_y", "gtkdatabox_8c.html#a316aa71c62c596bca6020de8e114c100", null ], + [ "gtk_databox_get_scale_type_x", "gtkdatabox_8c.html#ae236b52f27adc257c1a1677bd034a809", null ], + [ "gtk_databox_get_scale_type_y", "gtkdatabox_8c.html#a47fb481698b014aefd28987d34d98762", null ], + [ "gtk_databox_get_total_limits", "gtkdatabox_8c.html#a197375dfd7630767e1baf8eb135ed8fe", null ], + [ "gtk_databox_get_visible_limits", "gtkdatabox_8c.html#a31b912b173a75101fdd7694b0d3532fe", null ], + [ "gtk_databox_graph_add", "gtkdatabox_8c.html#a0168d23a87eaa96b52c87cdc70d2bb4f", null ], + [ "gtk_databox_graph_add_front", "gtkdatabox_8c.html#ac49a22eb43ec53fbd2c284931a0e24ee", null ], + [ "gtk_databox_graph_remove", "gtkdatabox_8c.html#ae2916c55d932b3206d872109327e297f", null ], + [ "gtk_databox_graph_remove_all", "gtkdatabox_8c.html#af3d3cdc400933bcce0d3b6b0c263c4e3", null ], + [ "gtk_databox_init", "gtkdatabox_8c.html#a28f0e2bc0bde79d2e5b232c95d6572b2", null ], + [ "gtk_databox_motion_notify", "gtkdatabox_8c.html#aa4baeea0701828393adfa9cd37777456", null ], + [ "gtk_databox_new", "gtkdatabox_8c.html#aefe1d2a9b6eb011a0c6395486e5466cd", null ], + [ "gtk_databox_pixel_to_value_x", "gtkdatabox_8c.html#a0daf2c497030d462688ec25afc830e64", null ], + [ "gtk_databox_pixel_to_value_y", "gtkdatabox_8c.html#a38f90b524114de6599397272a1b945a6", null ], + [ "gtk_databox_realize", "gtkdatabox_8c.html#a14486e897681f98fe344d2e63476ada7", null ], + [ "gtk_databox_ruler_update", "gtkdatabox_8c.html#a4af31861d91314f4a55e7a5ff0751a61", null ], + [ "gtk_databox_scroll_event", "gtkdatabox_8c.html#a226ec6c020c4537d54b1a169d2dc72b4", null ], + [ "gtk_databox_selection_cancel", "gtkdatabox_8c.html#a544eff9fa167b2788edfcbb4adb98ef8", null ], + [ "gtk_databox_set_adjustment_x", "gtkdatabox_8c.html#a0de4002660372d4a02065e3aa267f3ff", null ], + [ "gtk_databox_set_adjustment_y", "gtkdatabox_8c.html#ad7939f56d9b6c478b2c5965a06ce3de4", null ], + [ "gtk_databox_set_box_shadow", "gtkdatabox_8c.html#ad6b1212e0dfa6b3cbda233b7407c8a59", null ], + [ "gtk_databox_set_enable_selection", "gtkdatabox_8c.html#a16f7f0bde93ba0fc5a3787aefa5d96ee", null ], + [ "gtk_databox_set_enable_zoom", "gtkdatabox_8c.html#adf7fd230b1b4d97e358049b7a7dd473a", null ], + [ "gtk_databox_set_property", "gtkdatabox_8c.html#aa4667aeda40e9de0108fbaeb958b7833", null ], + [ "gtk_databox_set_ruler_x", "gtkdatabox_8c.html#a0a2c0e082b92a006d6ce5ac1002a401e", null ], + [ "gtk_databox_set_ruler_y", "gtkdatabox_8c.html#a5a578dfa16f7f9c4007854d2956527a7", null ], + [ "gtk_databox_set_scale_type_x", "gtkdatabox_8c.html#ab2e4f0151ac4b34972875f8f0630250e", null ], + [ "gtk_databox_set_scale_type_y", "gtkdatabox_8c.html#a192ae1623b31058c43d9bc5ffb37ee4f", null ], + [ "gtk_databox_set_total_limits", "gtkdatabox_8c.html#ab245f4858966f9a45e1fe420c89148ee", null ], + [ "gtk_databox_set_visible_limits", "gtkdatabox_8c.html#afdf49a0cedb00855df5fbb9c79b6218c", null ], + [ "gtk_databox_size_allocate", "gtkdatabox_8c.html#a36da13634ec185a60788289c2116dc88", null ], + [ "gtk_databox_unrealize", "gtkdatabox_8c.html#a666d9ba70c257556b6153575f4d5314f", null ], + [ "gtk_databox_value_to_pixel_x", "gtkdatabox_8c.html#a42c6205871d368f598e224907da9a83b", null ], + [ "gtk_databox_value_to_pixel_y", "gtkdatabox_8c.html#af931f9599ef4cc1d914380e9c6d19062", null ], + [ "gtk_databox_values_to_pixels", "gtkdatabox_8c.html#a8c6ac29cff63fe03130b4d3b8725669d", null ], + [ "gtk_databox_zoom_home", "gtkdatabox_8c.html#a248c860f6a4c2ddfe72895a07e7c0093", null ], + [ "gtk_databox_zoom_out", "gtkdatabox_8c.html#a3ab06e8ded8a4e3d07f28ec1e1835479", null ], + [ "gtk_databox_zoom_to_selection", "gtkdatabox_8c.html#aff7639886daa6f122c365bb484cb4ed2", null ], + [ "gtk_databox_zoomed", "gtkdatabox_8c.html#a223eba2157b35d19f9df02ed1704f9e2", null ], + [ "gtk_databox_signals", "gtkdatabox_8c.html#ac8f7b3bc85604ddf17c79abf21035ef8", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c__incl.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +80aa409f1e55048cf2afafb9660ed2e1 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +55a1c36ac073db9bc1d17b161da13cf0 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +9fdfca900da389717b2ec3ff24b355d3 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +7a036c60dbc3d7376cd33be692589984 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a0de4002660372d4a02065e3aa267f3ff_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +583fd5a81cd5ba3efa183ee4e52364fe \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +f9e44cdadda74779fe084902dee7d247 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +ee2e1b35cf2d51ad9782545b57977a20 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4c920250dd54fb417154b513a5597083_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +b8141924930cfe0db047d6544399c3f9 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +42a53b5dd836c02111fa5ca45e45063e \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +d52414d5a40bf7fda89cbbcbcec00b5f \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_a5a578dfa16f7f9c4007854d2956527a7_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +23287de49359e9b4e92aad1321b9efca \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +34f4ea4aa36ddc013287fd39383514de \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab245f4858966f9a45e1fe420c89148ee_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +d4c17c4406cb879c926883469ad6d628 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ab2e4f0151ac4b34972875f8f0630250e_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +802ed0a42ade392b35486cc13aa352f5 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +2a21057926497cda117413fe667dc14b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +700f8c8452622373946725c0d45104c9 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aebe5c38bf9f4c8a91499b684cb600301_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +8188d1471b356ef641ec1ecc09e0be99 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +60cb3c1ad9cc741978b632fd74a96b25 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +1b3c16bd6f7288b60dfd3da5d11fa27c \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afa49483edcb8f3558b811d362b2f136c_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +c0638ea887b3b0897aab20b5494be4d1 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8c_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h.html 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,1763 @@ + + + + + +GtkDatabox: gtk/gtkdatabox.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox.h File Reference
+
+
+
#include <gtkdatabox_typedefs.h>
+#include <gtkdatabox_graph.h>
+#include <gtkdatabox_ruler.h>
+#include <gtk/gtkwidget.h>
+#include <gtk/gtkadjustment.h>
+
+Include dependency graph for gtkdatabox.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  GtkDataboxValueRectangle
struct  _GtkDatabox
struct  _GtkDataboxClass

+Defines

#define GTK_TYPE_DATABOX   (gtk_databox_get_type ())
#define GTK_DATABOX(obj)
#define GTK_DATABOX_CLASS(klass)
#define GTK_IS_DATABOX(obj)
#define GTK_IS_DATABOX_CLASS(klass)
#define GTK_DATABOX_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxClass GtkDataboxClass
typedef struct _GtkDataboxPrivate GtkDataboxPrivate

+Functions

GType gtk_databox_get_type (void)
GtkWidget * gtk_databox_new (void)
gint gtk_databox_graph_add (GtkDatabox *box, GtkDataboxGraph *graph)
gint gtk_databox_graph_add_front (GtkDatabox *box, GtkDataboxGraph *graph)
gint gtk_databox_graph_remove (GtkDatabox *box, GtkDataboxGraph *graph)
gint gtk_databox_graph_remove_all (GtkDatabox *box)
gint gtk_databox_auto_rescale (GtkDatabox *box, gfloat border)
gint gtk_databox_calculate_extrema (GtkDatabox *box, gfloat *min_x, gfloat *max_x, gfloat *min_y, gfloat *max_y)
void gtk_databox_set_total_limits (GtkDatabox *box, gfloat left, gfloat right, gfloat top, gfloat bottom)
void gtk_databox_set_visible_limits (GtkDatabox *box, gfloat left, gfloat right, gfloat top, gfloat bottom)
void gtk_databox_get_total_limits (GtkDatabox *box, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom)
void gtk_databox_get_visible_limits (GtkDatabox *box, gfloat *left, gfloat *right, gfloat *top, gfloat *bottom)
void gtk_databox_set_adjustment_x (GtkDatabox *box, GtkAdjustment *adj)
void gtk_databox_set_adjustment_y (GtkDatabox *box, GtkAdjustment *adj)
GtkAdjustment * gtk_databox_get_adjustment_x (GtkDatabox *box)
GtkAdjustment * gtk_databox_get_adjustment_y (GtkDatabox *box)
void gtk_databox_set_ruler_x (GtkDatabox *box, GtkDataboxRuler *ruler)
void gtk_databox_set_ruler_y (GtkDatabox *box, GtkDataboxRuler *ruler)
GtkDataboxRuler * gtk_databox_get_ruler_x (GtkDatabox *box)
GtkDataboxRuler * gtk_databox_get_ruler_y (GtkDatabox *box)
void gtk_databox_set_scale_type_x (GtkDatabox *box, GtkDataboxScaleType scale_type)
void gtk_databox_set_scale_type_y (GtkDatabox *box, GtkDataboxScaleType scale_type)
GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox *box)
GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox *box)
void gtk_databox_set_enable_selection (GtkDatabox *box, gboolean enable)
void gtk_databox_set_enable_zoom (GtkDatabox *box, gboolean enable)
void gtk_databox_set_box_shadow (GtkDatabox *box, GtkShadowType which_shadow)
gboolean gtk_databox_get_enable_selection (GtkDatabox *box)
gboolean gtk_databox_get_enable_zoom (GtkDatabox *box)
GtkShadowType gtk_databox__get_box_shadow (GtkDatabox *box)
void gtk_databox_zoom_to_selection (GtkDatabox *box)
void gtk_databox_zoom_out (GtkDatabox *box)
void gtk_databox_zoom_home (GtkDatabox *box)
gint16 gtk_databox_value_to_pixel_x (GtkDatabox *box, gfloat value)
gint16 gtk_databox_value_to_pixel_y (GtkDatabox *box, gfloat value)
gfloat gtk_databox_pixel_to_value_x (GtkDatabox *box, gint16 pixel)
gfloat gtk_databox_pixel_to_value_y (GtkDatabox *box, gint16 pixel)
void gtk_databox_values_to_pixels (GtkDatabox *box, guint len, const gfloat *values_x, const gfloat *values_y, GdkPoint *pixels)
void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget **p_box, GtkWidget **p_table, gboolean scrollbar_x, gboolean scrollbar_y, gboolean ruler_x, gboolean ruler_y)
void gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget **p_box, GtkWidget **p_table, gboolean scrollbar_x, gboolean scrollbar_y, gboolean ruler_x, gboolean ruler_y, gboolean ruler_x_top, gboolean ruler_y_left)
GdkPixmap * gtk_databox_get_backing_pixmap (GtkDatabox *box)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_TYPE_DATABOX, \
+                                           GtkDatabox))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_TYPE_DATABOX, \
+                                           GtkDataboxClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_TYPE_DATABOX, \
+                                           GtkDataboxClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_IS_DATABOX( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_TYPE_DATABOX))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_IS_DATABOX_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_TYPE_DATABOX))
+
+
+
+ +
+
+ + + + +
#define GTK_TYPE_DATABOX   (gtk_databox_get_type ())
+
+
+

SECTION:gtkdatabox : A GTK+ widget to display large amounts of numerical data quickly and easily. gtkdatabox.h : GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxGrid

+

GtkDatabox is a widget for the GTK+ library designed to display large amounts of numerical data quickly and easily. It allows for one or more data sets of thousands of data points (X and Y coordinates) to be displayed and updated in split seconds.

+

It offers the ability to zoom into and out of the data, and to navigate through your data by scrolling.

+

In addition to rulers and a simple coordinate cross, it allows you to add one (or even more) configurable grids like on an oscilloscope.

+

Data may be presented as dots, lines connecting the data, or vertical bars. The widget allows you to easily transform pixel coordinates into data coordinates, thus allowing you to easily create powerful applications for data analysis.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxClass GtkDataboxClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxPrivate GtkDataboxPrivate
+
+
+

GtkDataboxPrivate

+

A private data structure used by the GtkDatabox. It shields all internal things from developers who are just using the widget.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GtkShadowType gtk_databox__get_box_shadow (GtkDatabox * box)
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_auto_rescale (GtkDatabox * box,
gfloat border 
)
+
+
+

gtk_databox_auto_rescale: : A GtkDatabox widget : Relative border width (e.g. 0.1 means that the border on each side is 10% of the data area).

+

This function is similar to gtk_databox_set_total_limits(). It sets the total limits to match the data extrema (see gtk_databox_calculate_extrema()). If you do not like data pixels exactly at the widget's border, you can add modify the limits using the border parameter: The limits are extended by *(max-min) if max!=min. If max==min, they are extended by *max (otherwise the data could not be scaled to the pixel realm).

+

After calling this function, x values grow from left to right, y values grow from bottom to top.

+

Return value: 0 on success, -1 if is no GtkDatabox widget, -2 if no datasets are available

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
gint gtk_databox_calculate_extrema (GtkDatabox * box,
gfloat * min_x,
gfloat * max_x,
gfloat * min_y,
gfloat * max_y 
)
+
+
+

gtk_databox_calculate_extrema: : A GtkDatabox widget : Will be filled with the lowest x value of all datasets : Will be filled with the highest x value of all datasets : Will be filled with the lowest y value of all datasets : Will be filled with the highest y value of all datasets

+

Determines the minimum and maximum x and y values of all GtkDataboxGraph objects which have been added to the GtkDatabox widget via gtk_databox_graph_add().

+

Return value: 0 on success, -1 if is no GtkDatabox widget, -2 if no datasets are available

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget ** p_box,
GtkWidget ** p_table,
gboolean scrollbar_x,
gboolean scrollbar_y,
gboolean ruler_x,
gboolean ruler_y 
)
+
+
+

gtk_databox_create_box_with_scrollbars_and_rulers: : Will contain a pointer to a GtkDatabox widget : Will contain a pointer to a #GtkTable widget : Whether to attach a horizontal scrollbar : Whether to attach a vertical scrollbar : Whether to attach a horizontal ruler : Whether to attach a vertical ruler

+

This is a convenience function which creates a GtkDatabox widget in a GtkTable widget optionally accompanied by scrollbars and rulers. You only have to fill in the data (gtk_databox_graph_add()) and adjust the limits (gtk_databox_set_total_limits() or gtk_databox_auto_rescale()).

+

This function produces the default databox with rulers at the top left and scroll bars at the bottom right.

+

: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y()

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget ** p_box,
GtkWidget ** p_table,
gboolean scrollbar_x,
gboolean scrollbar_y,
gboolean ruler_x,
gboolean ruler_y,
gboolean ruler_x_top,
gboolean ruler_y_left 
)
+
+
+

gtk_databox_create_box_with_scrollbars_and_rulers_positioned: : Will contain a pointer to a GtkDatabox widget : Will contain a pointer to a #GtkTable widget : Whether to attach a horizontal scrollbar : Whether to attach a vertical scrollbar : Whether to attach a horizontal ruler : Whether to attach a vertical ruler : Whether to put the ruler_x up the top : Whether to put the ruler_y on the left

+

This is a convenience function which creates a GtkDatabox widget in a GtkTable widget optionally accompanied by scrollbars and rulers. You only have to fill in the data (gtk_databox_graph_add()) and adjust the limits (gtk_databox_set_total_limits() or gtk_databox_auto_rescale()).

+

This function produces the default databox with rulers at the top left and scroll bars at the bottom right.

+

: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y(), gtk_databox_create_box_with_scrollbars_and_rulers()

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + +
GtkAdjustment* gtk_databox_get_adjustment_x (GtkDatabox * box)
+
+
+

gtk_databox_get_adjustment_x : A GtkDatabox widget.

+

Getter function for the GtkDatabox:adjustment-x property.

+

Return value: The GtkDatabox:adjustment-x property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkAdjustment* gtk_databox_get_adjustment_y (GtkDatabox * box)
+
+
+

gtk_databox_get_adjustment_y : A GtkDatabox widget.

+

Getter function for the GtkDatabox:adjustment-y property.

+

Return value: The GtkDatabox:adjustment-y property value.

+ +
+
+ +
+
+ + + + + + + + +
GdkPixmap* gtk_databox_get_backing_pixmap (GtkDatabox * box)
+
+
+

gtk_databox_get_backing_pixmap: : A GtkDatabox widget

+

This function returns the pixmap which is used by and its GtkDataboxGraph objects for drawing operations before copying the result to the screen.

+

The function is typically called by the GtkDataboxGraph objects.

+

Return value: Backing pixmap

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_get_enable_selection (GtkDatabox * box)
+
+
+

gtk_databox_get_enable_selection : A GtkDatabox widget.

+

Getter function for the GtkDatabox:enable-selection property.

+

Return value: The GtkDatabox:enable-selection property value.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_get_enable_zoom (GtkDatabox * box)
+
+
+

gtk_databox_get_enable_zoom : A GtkDatabox widget.

+

Getter function for the GtkDatabox:enable-zoom property.

+

Return value: The GtkDatabox:enable-zoom property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxRuler* gtk_databox_get_ruler_x (GtkDatabox * box)
+
+
+

gtk_databox_get_ruler_x : A GtkDatabox widget.

+

Getter function for the GtkDatabox:ruler-x property.

+

Return value: The GtkDatabox:ruler-x property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxRuler* gtk_databox_get_ruler_y (GtkDatabox * box)
+
+
+

gtk_databox_get_ruler_y : A GtkDatabox widget.

+

Getter function for the GtkDatabox:ruler-y property.

+

Return value: The GtkDatabox:ruler-y property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox * box)
+
+
+

gtk_databox_get_scale_type_x : A GtkDatabox widget.

+

Getter function for the GtkDatabox:scale-type-x property.

+

Return value: The GtkDatabox:scale-type-x property value.

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox * box)
+
+
+

gtk_databox_get_scale_type_y : A GtkDatabox widget.

+

Getter function for the GtkDatabox:scale-type-y property.

+

Return value: The GtkDatabox:scale-type-y property value.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_get_total_limits (GtkDatabox * box,
gfloat * left,
gfloat * right,
gfloat * top,
gfloat * bottom 
)
+
+
+

gtk_databox_get_total_limits: : A GtkDatabox widget : Space for total left value or #NULL : Space for total right value or #NULL : Space for total top value or #NULL : Space for total bottom value or #NULL

+

Gives the total limits (as set by gtk_databox_auto_rescale() or gtk_databox_set_total_limits()).

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_get_visible_limits (GtkDatabox * box,
gfloat * left,
gfloat * right,
gfloat * top,
gfloat * bottom 
)
+
+
+

gtk_databox_get_visible_limits: : A GtkDatabox widget : Space for visible left value or #NULL : Space for visible right value or #NULL : Space for visible top value or #NULL : Space for visible bottom value or #NULL

+

Gives the current visible limits. These differ from those given by gtk_databox_get_total_limits() if you zoomed into the data for instance by gtk_databox_zoom_to_selection() or gtk_databox_set_visible_limits() (these values can be changed by scrolling, of course).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_add (GtkDatabox * box,
GtkDataboxGraph * graph 
)
+
+
+

gtk_databox_graph_add: : A GtkDatabox widget : A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object

+

Adds the to the . The next time the is re-drawn, the graph will be shown.

+

It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()).

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_add_front (GtkDatabox * box,
GtkDataboxGraph * graph 
)
+
+
+

gtk_databox_graph_add_front: : A GtkDatabox widget : A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object

+

Adds the to the and will be plotted on top. The next time the is re-drawn, the graph will be shown.

+

It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()).

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_remove (GtkDatabox * box,
GtkDataboxGraph * graph 
)
+
+
+

gtk_databox_graph_remove: : A GtkDatabox widget : A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object

+

Removes the from the once. The next time the is re-drawn, the graph will not be shown (unless it was added more than once).

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_graph_remove_all (GtkDatabox * box)
+
+
+

gtk_databox_graph_remove_all: : A GtkDatabox widget

+

Removes all graphs from the . The next time the is re-drawn, no graphs will be shown.

+

Return value: 0 on success, -1 otherwise

+ +
+
+ +
+
+ + + + + + + + +
GtkWidget* gtk_databox_new (void )
+
+
+

gtk_databox_new

+

Creates a new GtkDatabox widget.

+

Return value: The new GtkDatabox widget.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gfloat gtk_databox_pixel_to_value_x (GtkDatabox * box,
gint16 pixel 
)
+
+
+

gtk_databox_pixel_to_value_x: : A GtkDatabox widget : A horizontal pixel coordinate

+

Calculates the x value which is represented by the horizontal coordinate. Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: x value

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gfloat gtk_databox_pixel_to_value_y (GtkDatabox * box,
gint16 pixel 
)
+
+
+

gtk_databox_pixel_to_value_y: : A GtkDatabox widget : A vertical pixel coordinate

+

Calculates the y value which is represented by the vertical coordinate. Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: y value

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_adjustment_x (GtkDatabox * box,
GtkAdjustment * adj 
)
+
+
+

gtk_databox_set_adjustment_x : A GtkDatabox widget : A #GtkAdjustment object

+

Setter function for the GtkDatabox:adjustment-x property. Normally, it should not be required to use this function, see property documentation.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_adjustment_y (GtkDatabox * box,
GtkAdjustment * adj 
)
+
+
+

gtk_databox_set_adjustment_y : A GtkDatabox widget : A #GtkAdjustment object

+

Setter function for the GtkDatabox:adjustment-y property. Normally, it should not be required to use this function, see property documentation.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_box_shadow (GtkDatabox * box,
GtkShadowType which_shadow 
)
+
+
+

gtk_databox_set_box_shadow: : a GtkDatabox widget. : How to render the box shadow on the GtkDatabox edges.

+

Sets the shadow type when using gtk_paint_box. This will draw the desired edge shadow.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_enable_selection (GtkDatabox * box,
gboolean enable 
)
+
+
+

gtk_databox_set_enable_selection : A GtkDatabox widget : Whether selection via mouse is enabled or not.

+

Setter function for the GtkDatabox:enable-selection property.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_enable_zoom (GtkDatabox * box,
gboolean enable 
)
+
+
+

gtk_databox_set_enable_zoom : A GtkDatabox widget : Whether zoom via mouse is enabled or not.

+

Setter function for the GtkDatabox:enable-zoom property.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_ruler_x (GtkDatabox * box,
GtkDataboxRuler * ruler 
)
+
+
+

gtk_databox_set_ruler_x : A GtkDatabox widget : A GtkDataboxRuler object

+

Setter function for the GtkDatabox:ruler-x property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_ruler_y (GtkDatabox * box,
GtkDataboxRuler * ruler 
)
+
+
+

gtk_databox_set_ruler_y : A GtkDatabox widget : An GtkDataboxRuler object

+

Setter function for the GtkDatabox:ruler-y property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_scale_type_x (GtkDatabox * box,
GtkDataboxScaleType scale_type 
)
+
+
+

gtk_databox_set_scale_type_x : A GtkDatabox widget : An GtkDataboxScaleType (linear or logarithmic)

+

Setter function for the GtkDatabox:scale-type-x property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_set_scale_type_y (GtkDatabox * box,
GtkDataboxScaleType scale_type 
)
+
+
+

gtk_databox_set_scale_type_y : A GtkDatabox widget : An GtkDataboxScaleType (linear or logarithmic)

+

Setter function for the GtkDatabox:scale-type-y property.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_set_total_limits (GtkDatabox * box,
gfloat left,
gfloat right,
gfloat top,
gfloat bottom 
)
+
+
+

gtk_databox_set_total_limits: : A GtkDatabox widget : Left total limit : Right total limit : Top total limit : Bottom total limit

+

This function is used to set the limits of the total display area of . This function can be used to invert the orientation of the displayed graphs, e.g. =-1000 and =0.

+

Side effect: The also internally calls gtk_databox_set_visible_limits() with the same values.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_set_visible_limits (GtkDatabox * box,
gfloat left,
gfloat right,
gfloat top,
gfloat bottom 
)
+
+
+

gtk_databox_set_visible_limits: : A GtkDatabox widget : Left visible limit : Right visible limit : Top visible limit : Bottom visible limit

+

This function is used to set the limits of the visible display area of . The visible display area can be section of the total area, i.e. the zooms in, showing only a part of the complete picture.

+

The orientation of the values have to be the same as in gtk_databox_set_total_limits() and the visible limits have to be within the total limits. The values will not be used otherwise.

+

Side effect: The emits #GtkDatabox::zoomed.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint16 gtk_databox_value_to_pixel_x (GtkDatabox * box,
gfloat value 
)
+
+
+

gtk_databox_value_to_pixel_x: : A GtkDatabox widget : An x value

+

Calculates the horizontal pixel coordinate which represents the x . Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: Pixel coordinate

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
gint16 gtk_databox_value_to_pixel_y (GtkDatabox * box,
gfloat value 
)
+
+
+

gtk_databox_value_to_pixel_y: : A GtkDatabox widget : A y value

+

Calculates the vertical pixel coordinate which represents the y . Pixel coordinates are relative to the top-left corner of the which is equivalent to (0,0).

+

Return value: Pixel coordinate

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_values_to_pixels (GtkDatabox * box,
guint len,
const gfloat * values_x,
const gfloat * values_y,
GdkPoint * pixels 
)
+
+
+

gtk_databox_values_to_pixels: : A GtkDatabox widget : Number of values/pixels : Array of X values (length >= len) : Array of Y values (length >= len) : Array of pixel coordinates (length >= len)

+

Calculates the pixel equivalents of the given X/Y values and stores them in the array.

+ +
+
+ +
+
+ + + + + + + + +
void gtk_databox_zoom_home (GtkDatabox * box)
+
+
+

gtk_databox_zoom_home: : A GtkDatabox widget

+

This is equivalent to shift right-clicking into the .

+

This function works, if the attribute #enable-zoom is set to #TRUE. It is equivalent to calling the gtk_databox_set_visible_limits() with the total limits.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + +
void gtk_databox_zoom_out (GtkDatabox * box)
+
+
+

gtk_databox_zoom_out: : A GtkDatabox widget

+

This is equivalent to right-clicking into the .

+

This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function then zooms out by a factor of 2 in both dimensions (the maximum is defined by the total limits, see gtk_databox_set_total_limits()).

+

Side effect: The emits #GtkDatabox::zoomed.

+ +
+
+ +
+
+ + + + + + + + +
void gtk_databox_zoom_to_selection (GtkDatabox * box)
+
+
+

gtk_databox_zoom_to_selection: : A GtkDatabox widget

+

This is equivalent to left-clicking into the selected area.

+

This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function then zooms to the area selected with the mouse.

+

Side effect: The emits #GtkDatabox::zoomed.

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,52 @@ +var gtkdatabox_8h = +[ + [ "GTK_DATABOX", "gtkdatabox_8h.html#a863f3743ab31cafa40c50d67262641e3", null ], + [ "GTK_DATABOX_CLASS", "gtkdatabox_8h.html#a10d9d5f6b9d6b1d74f98fc0dda2a0b90", null ], + [ "GTK_DATABOX_GET_CLASS", "gtkdatabox_8h.html#a3c09c1aa964fa641f03193e5c9a38cc3", null ], + [ "GTK_IS_DATABOX", "gtkdatabox_8h.html#a54b97ad6b9d974ae6f98076e2cc8b25b", null ], + [ "GTK_IS_DATABOX_CLASS", "gtkdatabox_8h.html#a7769c919c1a7475f177519c8fe4c1b33", null ], + [ "GTK_TYPE_DATABOX", "gtkdatabox_8h.html#ab4e95ba3ac3751df40bfd23eeca5f115", null ], + [ "GtkDataboxClass", "gtkdatabox_8h.html#ac293098859d24c650cfcbd2cfb685fd8", null ], + [ "GtkDataboxPrivate", "gtkdatabox_8h.html#a6a52a767dc26729348d9551a1783645b", null ], + [ "gtk_databox__get_box_shadow", "gtkdatabox_8h.html#a7a7fd437367efd28126fff4791924301", null ], + [ "gtk_databox_auto_rescale", "gtkdatabox_8h.html#a4c920250dd54fb417154b513a5597083", null ], + [ "gtk_databox_calculate_extrema", "gtkdatabox_8h.html#aebe5c38bf9f4c8a91499b684cb600301", null ], + [ "gtk_databox_create_box_with_scrollbars_and_rulers", "gtkdatabox_8h.html#a4ec019fb9c9522331a249b7a5cd7a2c9", null ], + [ "gtk_databox_create_box_with_scrollbars_and_rulers_positioned", "gtkdatabox_8h.html#afa49483edcb8f3558b811d362b2f136c", null ], + [ "gtk_databox_get_adjustment_x", "gtkdatabox_8h.html#a83a9ff9f95114b50b77af27ed89eed03", null ], + [ "gtk_databox_get_adjustment_y", "gtkdatabox_8h.html#a46eb687d25d1a4e9a477205b06680add", null ], + [ "gtk_databox_get_backing_pixmap", "gtkdatabox_8h.html#a4b4c9464145f3e49757a0b1c0c5459e4", null ], + [ "gtk_databox_get_enable_selection", "gtkdatabox_8h.html#adf14dcd39ad139fdac6196bc79273c0c", null ], + [ "gtk_databox_get_enable_zoom", "gtkdatabox_8h.html#afd6a2b050e00f804f0d473eb8c9ea518", null ], + [ "gtk_databox_get_ruler_x", "gtkdatabox_8h.html#a21a1d0082f412eb0131aea7d643e7a7e", null ], + [ "gtk_databox_get_ruler_y", "gtkdatabox_8h.html#a316aa71c62c596bca6020de8e114c100", null ], + [ "gtk_databox_get_scale_type_x", "gtkdatabox_8h.html#ae236b52f27adc257c1a1677bd034a809", null ], + [ "gtk_databox_get_scale_type_y", "gtkdatabox_8h.html#a47fb481698b014aefd28987d34d98762", null ], + [ "gtk_databox_get_total_limits", "gtkdatabox_8h.html#a197375dfd7630767e1baf8eb135ed8fe", null ], + [ "gtk_databox_get_type", "gtkdatabox_8h.html#a2de5ecf8033c451b9391c59ccdf063ab", null ], + [ "gtk_databox_get_visible_limits", "gtkdatabox_8h.html#a31b912b173a75101fdd7694b0d3532fe", null ], + [ "gtk_databox_graph_add", "gtkdatabox_8h.html#a0168d23a87eaa96b52c87cdc70d2bb4f", null ], + [ "gtk_databox_graph_add_front", "gtkdatabox_8h.html#ac49a22eb43ec53fbd2c284931a0e24ee", null ], + [ "gtk_databox_graph_remove", "gtkdatabox_8h.html#ae2916c55d932b3206d872109327e297f", null ], + [ "gtk_databox_graph_remove_all", "gtkdatabox_8h.html#af3d3cdc400933bcce0d3b6b0c263c4e3", null ], + [ "gtk_databox_new", "gtkdatabox_8h.html#aefe1d2a9b6eb011a0c6395486e5466cd", null ], + [ "gtk_databox_pixel_to_value_x", "gtkdatabox_8h.html#a0daf2c497030d462688ec25afc830e64", null ], + [ "gtk_databox_pixel_to_value_y", "gtkdatabox_8h.html#a38f90b524114de6599397272a1b945a6", null ], + [ "gtk_databox_set_adjustment_x", "gtkdatabox_8h.html#a0de4002660372d4a02065e3aa267f3ff", null ], + [ "gtk_databox_set_adjustment_y", "gtkdatabox_8h.html#ad7939f56d9b6c478b2c5965a06ce3de4", null ], + [ "gtk_databox_set_box_shadow", "gtkdatabox_8h.html#ad6b1212e0dfa6b3cbda233b7407c8a59", null ], + [ "gtk_databox_set_enable_selection", "gtkdatabox_8h.html#a16f7f0bde93ba0fc5a3787aefa5d96ee", null ], + [ "gtk_databox_set_enable_zoom", "gtkdatabox_8h.html#adf7fd230b1b4d97e358049b7a7dd473a", null ], + [ "gtk_databox_set_ruler_x", "gtkdatabox_8h.html#a0a2c0e082b92a006d6ce5ac1002a401e", null ], + [ "gtk_databox_set_ruler_y", "gtkdatabox_8h.html#a5a578dfa16f7f9c4007854d2956527a7", null ], + [ "gtk_databox_set_scale_type_x", "gtkdatabox_8h.html#ab2e4f0151ac4b34972875f8f0630250e", null ], + [ "gtk_databox_set_scale_type_y", "gtkdatabox_8h.html#a192ae1623b31058c43d9bc5ffb37ee4f", null ], + [ "gtk_databox_set_total_limits", "gtkdatabox_8h.html#ab245f4858966f9a45e1fe420c89148ee", null ], + [ "gtk_databox_set_visible_limits", "gtkdatabox_8h.html#afdf49a0cedb00855df5fbb9c79b6218c", null ], + [ "gtk_databox_value_to_pixel_x", "gtkdatabox_8h.html#a42c6205871d368f598e224907da9a83b", null ], + [ "gtk_databox_value_to_pixel_y", "gtkdatabox_8h.html#af931f9599ef4cc1d914380e9c6d19062", null ], + [ "gtk_databox_values_to_pixels", "gtkdatabox_8h.html#a8c6ac29cff63fe03130b4d3b8725669d", null ], + [ "gtk_databox_zoom_home", "gtkdatabox_8h.html#a248c860f6a4c2ddfe72895a07e7c0093", null ], + [ "gtk_databox_zoom_out", "gtkdatabox_8h.html#a3ab06e8ded8a4e3d07f28ec1e1835479", null ], + [ "gtk_databox_zoom_to_selection", "gtkdatabox_8h.html#aff7639886daa6f122c365bb484cb4ed2", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__dep__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +80e224e01e4172a6f69134a585d7e6fb \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__incl.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +b68f77e7844e4dff08c8a497bd9d7f42 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +55a1c36ac073db9bc1d17b161da13cf0 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +9fdfca900da389717b2ec3ff24b355d3 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0a2c0e082b92a006d6ce5ac1002a401e_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +7a036c60dbc3d7376cd33be692589984 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a0de4002660372d4a02065e3aa267f3ff_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +583fd5a81cd5ba3efa183ee4e52364fe \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a192ae1623b31058c43d9bc5ffb37ee4f_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +f9e44cdadda74779fe084902dee7d247 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a248c860f6a4c2ddfe72895a07e7c0093_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +ee2e1b35cf2d51ad9782545b57977a20 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4c920250dd54fb417154b513a5597083_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +b8141924930cfe0db047d6544399c3f9 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a4ec019fb9c9522331a249b7a5cd7a2c9_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +42a53b5dd836c02111fa5ca45e45063e \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +d52414d5a40bf7fda89cbbcbcec00b5f \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_a5a578dfa16f7f9c4007854d2956527a7_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +23287de49359e9b4e92aad1321b9efca \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +34f4ea4aa36ddc013287fd39383514de \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab245f4858966f9a45e1fe420c89148ee_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +d4c17c4406cb879c926883469ad6d628 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ab2e4f0151ac4b34972875f8f0630250e_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +802ed0a42ade392b35486cc13aa352f5 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_ad7939f56d9b6c478b2c5965a06ce3de4_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +2a21057926497cda117413fe667dc14b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.map 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +700f8c8452622373946725c0d45104c9 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aebe5c38bf9f4c8a91499b684cb600301_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +8188d1471b356ef641ec1ecc09e0be99 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_aefe1d2a9b6eb011a0c6395486e5466cd_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +60cb3c1ad9cc741978b632fd74a96b25 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +1b3c16bd6f7288b60dfd3da5d11fa27c \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afa49483edcb8f3558b811d362b2f136c_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +c0638ea887b3b0897aab20b5494be4d1 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_afdf49a0cedb00855df5fbb9c79b6218c_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,299 @@ + + + + + +GtkDatabox: gtk/gtkdatabox.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox.h 3 2008-06-22 08:45:45Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  *
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  *
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00020 #ifndef __GTK_DATABOX_H__
+00021 #define __GTK_DATABOX_H__
+00022 
+00023 #include <gtkdatabox_typedefs.h>
+00024 #include <gtkdatabox_graph.h>
+00025 #include <gtkdatabox_ruler.h>
+00026 #include <gtk/gtkwidget.h>
+00027 #include <gtk/gtkadjustment.h>
+00028 
+00054 G_BEGIN_DECLS
+00055 #define GTK_TYPE_DATABOX                  (gtk_databox_get_type ())
+00056 #define GTK_DATABOX(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00057                                            GTK_TYPE_DATABOX, \
+00058                                            GtkDatabox))
+00059 #define GTK_DATABOX_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00060                                            GTK_TYPE_DATABOX, \
+00061                                            GtkDataboxClass))
+00062 #define GTK_IS_DATABOX(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00063                                            GTK_TYPE_DATABOX))
+00064 #define GTK_IS_DATABOX_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00065                                            GTK_TYPE_DATABOX))
+00066 #define GTK_DATABOX_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00067                                            GTK_TYPE_DATABOX, \
+00068                                            GtkDataboxClass))
+00069 
+00070 
+00071 typedef struct _GtkDataboxClass GtkDataboxClass;
+00072 
+00080 typedef struct _GtkDataboxPrivate GtkDataboxPrivate;
+00081 
+00082 typedef struct
+00083 {
+00084     gfloat x1;
+00085     gfloat x2;
+00086     gfloat y1;
+00087     gfloat y2;
+00088 } GtkDataboxValueRectangle;
+00089 
+00098 struct _GtkDatabox
+00099 {
+00100     /*< private >*/
+00101     GtkWidget box;
+00102 
+00103     GtkDataboxPrivate *priv;
+00104 };
+00105 
+00106 struct _GtkDataboxClass
+00107 {
+00108     GtkWidgetClass parent_class;
+00109 
+00110     void (*zoomed) (GtkDatabox * box);
+00111     void (*selection_started) (GtkDatabox * box,
+00112                                GtkDataboxValueRectangle * selectionValues);
+00113     void (*selection_changed) (GtkDatabox * box,
+00114                                GtkDataboxValueRectangle * selectionValues);
+00115     void (*selection_finalized) (GtkDatabox * box,
+00116                                  GtkDataboxValueRectangle *
+00117                                  selectionValues);
+00118     void (*selection_canceled) (GtkDatabox * box);
+00119 };
+00120 
+00121 GType gtk_databox_get_type (void);
+00122 
+00123 GtkWidget *gtk_databox_new (void);
+00124 
+00125 gint gtk_databox_graph_add (GtkDatabox * box, GtkDataboxGraph * graph);
+00126 gint gtk_databox_graph_add_front (GtkDatabox * box, GtkDataboxGraph * graph);
+00127 
+00128 gint gtk_databox_graph_remove (GtkDatabox * box, GtkDataboxGraph * graph);
+00129 gint gtk_databox_graph_remove_all (GtkDatabox * box);
+00130 
+00131 gint gtk_databox_auto_rescale (GtkDatabox * box, gfloat border);
+00132 gint gtk_databox_calculate_extrema (GtkDatabox * box,
+00133                                     gfloat * min_x, gfloat * max_x,
+00134                                     gfloat * min_y, gfloat * max_y);
+00135 
+00136 void gtk_databox_set_total_limits (GtkDatabox * box,
+00137                                    gfloat left, gfloat right,
+00138                                    gfloat top, gfloat bottom);
+00139 void gtk_databox_set_visible_limits (GtkDatabox * box,
+00140                                      gfloat left, gfloat right,
+00141                                      gfloat top, gfloat bottom);
+00142 void gtk_databox_get_total_limits (GtkDatabox * box,
+00143                                    gfloat * left, gfloat * right,
+00144                                    gfloat * top, gfloat * bottom);
+00145 void gtk_databox_get_visible_limits (GtkDatabox * box,
+00146                                      gfloat * left, gfloat * right,
+00147                                      gfloat * top, gfloat * bottom);
+00148 
+00149 void gtk_databox_set_adjustment_x (GtkDatabox * box, GtkAdjustment * adj);
+00150 void gtk_databox_set_adjustment_y (GtkDatabox * box, GtkAdjustment * adj);
+00151 GtkAdjustment *gtk_databox_get_adjustment_x (GtkDatabox * box);
+00152 GtkAdjustment *gtk_databox_get_adjustment_y (GtkDatabox * box);
+00153 
+00154 void gtk_databox_set_ruler_x (GtkDatabox * box, GtkDataboxRuler * ruler);
+00155 void gtk_databox_set_ruler_y (GtkDatabox * box, GtkDataboxRuler * ruler);
+00156 GtkDataboxRuler *gtk_databox_get_ruler_x (GtkDatabox * box);
+00157 GtkDataboxRuler *gtk_databox_get_ruler_y (GtkDatabox * box);
+00158 
+00159 void gtk_databox_set_scale_type_x (GtkDatabox * box,
+00160                                    GtkDataboxScaleType scale_type);
+00161 void gtk_databox_set_scale_type_y (GtkDatabox * box,
+00162                                    GtkDataboxScaleType scale_type);
+00163 GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox * box);
+00164 GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox * box);
+00165 
+00166 void gtk_databox_set_enable_selection (GtkDatabox * box, gboolean enable);
+00167 void gtk_databox_set_enable_zoom (GtkDatabox * box, gboolean enable);
+00168 void gtk_databox_set_box_shadow(GtkDatabox * box, GtkShadowType which_shadow);
+00169 
+00170 gboolean gtk_databox_get_enable_selection (GtkDatabox * box);
+00171 gboolean gtk_databox_get_enable_zoom (GtkDatabox * box);
+00172 GtkShadowType gtk_databox__get_box_shadow(GtkDatabox * box);
+00173 
+00174 void gtk_databox_zoom_to_selection (GtkDatabox * box);
+00175 void gtk_databox_zoom_out (GtkDatabox * box);
+00176 void gtk_databox_zoom_home (GtkDatabox * box);
+00177 
+00178 gint16 gtk_databox_value_to_pixel_x (GtkDatabox * box, gfloat value);
+00179 gint16 gtk_databox_value_to_pixel_y (GtkDatabox * box, gfloat value);
+00180 gfloat gtk_databox_pixel_to_value_x (GtkDatabox * box, gint16 pixel);
+00181 gfloat gtk_databox_pixel_to_value_y (GtkDatabox * box, gint16 pixel);
+00182 void gtk_databox_values_to_pixels (GtkDatabox * box,
+00183                                    guint len,
+00184                                    const gfloat * values_x,
+00185                                    const gfloat * values_y,
+00186                                    GdkPoint * pixels);
+00187 
+00188 void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget **
+00189         p_box,
+00190         GtkWidget **
+00191         p_table,
+00192         gboolean scrollbar_x,
+00193         gboolean scrollbar_y,
+00194         gboolean ruler_x,
+00195         gboolean ruler_y);
+00196 
+00197 void
+00198 gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget ** p_box,
+00199         GtkWidget ** p_table,
+00200         gboolean scrollbar_x,
+00201         gboolean scrollbar_y,
+00202         gboolean ruler_x,
+00203         gboolean ruler_y,
+00204         gboolean ruler_x_top,
+00205         gboolean ruler_y_left);
+00206 
+00207 /* Used by graph objects */
+00208 GdkPixmap* gtk_databox_get_backing_pixmap(GtkDatabox * box);
+00209 
+00210 G_END_DECLS
+00211 #endif                          /* __GTK_DATABOX_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c.html 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,214 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_bars.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Functions
+
+
gtk/gtkdatabox_bars.c File Reference
+
+
+
#include <gtkdatabox_bars.h>
+
+Include dependency graph for gtkdatabox_bars.c:
+
+
+ + +
+
+ + + + + +

+Data Structures

struct  _GtkDataboxBarsPrivate

+Functions

GType gtk_databox_bars_get_type (void)
GtkDataboxGraph * gtk_databox_bars_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, guint size)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_bars_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_bars_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_bars_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxBars object which can be added to a GtkDatabox widget

+

Return value: A new GtkDataboxBars object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,11 @@ +var gtkdatabox__bars_8c = +[ + [ "bars_finalize", "gtkdatabox__bars_8c.html#ac9e61781f0117e39fdaee54c26bb7073", null ], + [ "gtk_databox_bars_class_init", "gtkdatabox__bars_8c.html#a9c4af2c3127ed20f18af201ed4597c99", null ], + [ "gtk_databox_bars_complete", "gtkdatabox__bars_8c.html#a4dbd1e34d24a21be2aaf6b99c2d1fee2", null ], + [ "gtk_databox_bars_get_type", "gtkdatabox__bars_8c.html#a309c4e3eff97d4a5777b27e92a7d6f68", null ], + [ "gtk_databox_bars_instance_init", "gtkdatabox__bars_8c.html#a26dfe2ba39f95efd54b49aae62e012cb", null ], + [ "gtk_databox_bars_new", "gtkdatabox__bars_8c.html#ac6024f5cfde87cfa8daee1804c03c76e", null ], + [ "gtk_databox_bars_real_draw", "gtkdatabox__bars_8c.html#a5d8701eadfb1d7ec4f45404d2ff9d8bb", null ], + [ "parent_class", "gtkdatabox__bars_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +819a264d1fac3d31f7e0d56df98f1f8a \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h.html 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,398 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_bars.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_bars.h File Reference
+
+
+
#include <gtkdatabox_xyc_graph.h>
+
+Include dependency graph for gtkdatabox_bars.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxBars
struct  _GtkDataboxBarsClass

+Defines

#define GTK_DATABOX_TYPE_BARS   (gtk_databox_bars_get_type ())
#define GTK_DATABOX_BARS(obj)
#define GTK_DATABOX_BARS_CLASS(klass)
#define GTK_DATABOX_IS_BARS(obj)
#define GTK_DATABOX_IS_BARS_CLASS(klass)
#define GTK_DATABOX_BARS_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxBars GtkDataboxBars
typedef struct _GtkDataboxBarsClass GtkDataboxBarsClass
typedef struct
+_GtkDataboxBarsPrivate 		GtkDataboxBarsPrivate

+Functions

GType gtk_databox_bars_get_type (void)
GtkDataboxGraph * gtk_databox_bars_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, guint size)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_BARS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_BARS, \
+                                           GtkDataboxBars))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_BARS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_BARS, \
+                                           GtkDataboxBarsClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_BARS_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_BARS, \
+                                           GtkDataboxBarsClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_BARS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_BARS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_BARS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_BARS))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_BARS   (gtk_databox_bars_get_type ())
+
+
+

SECTION:gtkdatabox_bars : A GtkDataboxGraph used for displaying xy-values as vertical bars. gtkdatabox_bars.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers

+

GtkDataboxBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y=0.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxBars GtkDataboxBars
+
+
+

GtkDataboxBars: : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers

+

GtkDataboxBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y=0.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxBarsClass GtkDataboxBarsClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxBarsPrivate GtkDataboxBarsPrivate
+
+
+

GtkDataboxBarsPrivate

+

A private data structure used by the GtkDataboxBars. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_bars_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_bars_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_bars_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxBars object which can be added to a GtkDatabox widget

+

Return value: A new GtkDataboxBars object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var gtkdatabox__bars_8h = +[ + [ "GTK_DATABOX_BARS", "gtkdatabox__bars_8h.html#a021bc80305baf8ec249ee0d5b30b011d", null ], + [ "GTK_DATABOX_BARS_CLASS", "gtkdatabox__bars_8h.html#a1cae275933724557eb1081d2d8e67aea", null ], + [ "GTK_DATABOX_BARS_GET_CLASS", "gtkdatabox__bars_8h.html#a8f13cf073f91d9725edc48322b67ede7", null ], + [ "GTK_DATABOX_IS_BARS", "gtkdatabox__bars_8h.html#a7a3df2152dd852e32f51139d3c4d21da", null ], + [ "GTK_DATABOX_IS_BARS_CLASS", "gtkdatabox__bars_8h.html#a89d12a1f52fe004c419646ed36f80615", null ], + [ "GTK_DATABOX_TYPE_BARS", "gtkdatabox__bars_8h.html#a5890e44a5db4441489989437567b9f5e", null ], + [ "GtkDataboxBars", "gtkdatabox__bars_8h.html#a46df0a2249d4d9f8f1b6d6bab5e543f7", null ], + [ "GtkDataboxBarsClass", "gtkdatabox__bars_8h.html#a84320e12b0152066a034477df49819d3", null ], + [ "GtkDataboxBarsPrivate", "gtkdatabox__bars_8h.html#a086afddf473534e132fb425745d17662", null ], + [ "gtk_databox_bars_get_type", "gtkdatabox__bars_8h.html#a309c4e3eff97d4a5777b27e92a7d6f68", null ], + [ "gtk_databox_bars_new", "gtkdatabox__bars_8h.html#ac6024f5cfde87cfa8daee1804c03c76e", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__dep__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +da45ef9d0e30923c46bd7bd5e3bece85 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +b7b99b9f5bbf45c2fea6274c374024d2 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__bars_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__bars_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,194 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_bars.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_bars.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_bars.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00030 #ifndef __GTK_DATABOX_BARS_H__
+00031 #define __GTK_DATABOX_BARS_H__
+00032 
+00033 #include <gtkdatabox_xyc_graph.h>
+00034 
+00035 G_BEGIN_DECLS
+00036 #define GTK_DATABOX_TYPE_BARS             (gtk_databox_bars_get_type ())
+00037 #define GTK_DATABOX_BARS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00038                                            GTK_DATABOX_TYPE_BARS, \
+00039                                            GtkDataboxBars))
+00040 #define GTK_DATABOX_BARS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00041                                            GTK_DATABOX_TYPE_BARS, \
+00042                                            GtkDataboxBarsClass))
+00043 #define GTK_DATABOX_IS_BARS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00044                                            GTK_DATABOX_TYPE_BARS))
+00045 #define GTK_DATABOX_IS_BARS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00046                                            GTK_DATABOX_TYPE_BARS))
+00047 #define GTK_DATABOX_BARS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00048                                            GTK_DATABOX_TYPE_BARS, \
+00049                                            GtkDataboxBarsClass))
+00050 
+00058    typedef struct _GtkDataboxBars GtkDataboxBars;
+00059 
+00060    typedef struct _GtkDataboxBarsClass GtkDataboxBarsClass;
+00061 
+00069    typedef struct _GtkDataboxBarsPrivate GtkDataboxBarsPrivate;
+00070 
+00071    struct _GtkDataboxBars
+00072    {
+00073       /*< private >*/
+00074       GtkDataboxXYCGraph parent;
+00075 
+00076       GtkDataboxBarsPrivate *priv;
+00077    };
+00078 
+00079    struct _GtkDataboxBarsClass
+00080    {
+00081       GtkDataboxXYCGraphClass parent_class;
+00082    };
+00083 
+00084    GType gtk_databox_bars_get_type (void);
+00085 
+00086    GtkDataboxGraph *gtk_databox_bars_new (guint len, gfloat * X, gfloat * Y,
+00087                                           GdkColor * color, guint size);
+00088 
+00089 G_END_DECLS
+00090 #endif                          /* __GTK_DATABOX_BARS_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c.html 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,201 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_cross_simple.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Functions
+
+
gtk/gtkdatabox_cross_simple.c File Reference
+
+
+
#include <gtkdatabox_cross_simple.h>
+
+Include dependency graph for gtkdatabox_cross_simple.c:
+
+
+ + +
+
+ + + +

+Functions

GType gtk_databox_cross_simple_get_type (void)
GtkDataboxGraph * gtk_databox_cross_simple_new (GdkColor *color, guint size)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_cross_simple_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_cross_simple_new (GdkColor * color,
guint size 
)
+
+
+

gtk_databox_cross_simple_new: : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxCrossSimple object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxCrossSimple object

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,8 @@ +var gtkdatabox__cross__simple_8c = +[ + [ "cross_simple_finalize", "gtkdatabox__cross__simple_8c.html#a000c6e42bdf96c6150eb005c783131a2", null ], + [ "gtk_databox_cross_simple_class_init", "gtkdatabox__cross__simple_8c.html#a6551e58228db59b74d617ca50fce2e32", null ], + [ "gtk_databox_cross_simple_get_type", "gtkdatabox__cross__simple_8c.html#abe1334309f941b48a84153df9d13dfe3", null ], + [ "gtk_databox_cross_simple_new", "gtkdatabox__cross__simple_8c.html#ab818cbbf158ea66ef3bcaf06a584c01c", null ], + [ "parent_class", "gtkdatabox__cross__simple_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +543b312996618ceabd237d40a5abb579 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +5c922b97ea0e57088975f6dbca9df25f \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8c_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h.html 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,393 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_cross_simple.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_cross_simple.h File Reference
+
+
+
#include <gtkdatabox_markers.h>
+
+Include dependency graph for gtkdatabox_cross_simple.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxCrossSimple
struct  _GtkDataboxCrossSimpleClass

+Defines

#define GTK_DATABOX_TYPE_CROSS_SIMPLE   (gtk_databox_cross_simple_get_type ())
#define GTK_DATABOX_CROSS_SIMPLE(obj)
#define GTK_DATABOX_CROSS_SIMPLE_CLASS(klass)
#define GTK_DATABOX_IS_CROSS_SIMPLE(obj)
#define GTK_DATABOX_IS_CROSS_SIMPLE_CLASS(klass)
#define GTK_DATABOX_CROSS_SIMPLE_GET_CLASS(obj)

+Typedefs

typedef struct
+_GtkDataboxCrossSimple 		GtkDataboxCrossSimple
typedef struct
+_GtkDataboxCrossSimpleClass 		GtkDataboxCrossSimpleClass
typedef struct
+_GtkDataboxCrossSimplePrivate 		GtkDataboxCrossSimplePrivate

+Functions

GType gtk_databox_cross_simple_get_type (void)
GtkDataboxGraph * gtk_databox_cross_simple_new (GdkColor *color, guint size)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_CROSS_SIMPLE( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_CROSS_SIMPLE, \
+                                           GtkDataboxCrossSimple))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_CROSS_SIMPLE_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_CROSS_SIMPLE, \
+                                           GtkDataboxCrossSimpleClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_CROSS_SIMPLE_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_CROSS_SIMPLE, \
+                                           GtkDataboxCrossSimpleClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_CROSS_SIMPLE( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_CROSS_SIMPLE))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_CROSS_SIMPLE_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_CROSS_SIMPLE))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_CROSS_SIMPLE   (gtk_databox_cross_simple_get_type ())
+
+
+

SECTION:gtkdatabox_cross_simple : A GtkDataboxGraph used for displaying a simple coordinate cross. gtkdatabox_cross_simple.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers

+

GtkDataboxCrossSimple is a GtkDataboxGraph class for displaying a simple coordinate cross (a vertical line at x=0 and a horizontal line at y=0).

+

A more sophisticated coordinate cross would be welcome :-)

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxCrossSimple GtkDataboxCrossSimple
+
+
+

GtkDataboxCrossSimple: : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers

+

GtkDataboxCrossSimple is a GtkDataboxGraph class for displaying a simple coordinate cross (a vertical line at x=0 and a horizontal line at y=0).

+

A more sophisticated coordinate cross would be welcome :-)

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxCrossSimpleClass GtkDataboxCrossSimpleClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxCrossSimplePrivate GtkDataboxCrossSimplePrivate
+
+
+

GtkDataboxCrossSimplePrivate

+

A private data structure used by the GtkDataboxCrossSimple. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_cross_simple_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_cross_simple_new (GdkColor * color,
guint size 
)
+
+
+

gtk_databox_cross_simple_new: : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxCrossSimple object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxCrossSimple object

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var gtkdatabox__cross__simple_8h = +[ + [ "GTK_DATABOX_CROSS_SIMPLE", "gtkdatabox__cross__simple_8h.html#a654d94c723f3dcbb2dac733f960c3ee7", null ], + [ "GTK_DATABOX_CROSS_SIMPLE_CLASS", "gtkdatabox__cross__simple_8h.html#a073cd91ad404508ec2b11c2ec5b8898e", null ], + [ "GTK_DATABOX_CROSS_SIMPLE_GET_CLASS", "gtkdatabox__cross__simple_8h.html#a4294e892e06860e20460f363720e0273", null ], + [ "GTK_DATABOX_IS_CROSS_SIMPLE", "gtkdatabox__cross__simple_8h.html#a50da38260ac6ba48f7503a16bbf6056d", null ], + [ "GTK_DATABOX_IS_CROSS_SIMPLE_CLASS", "gtkdatabox__cross__simple_8h.html#a683e2d6b5a381fc58390ef654f838243", null ], + [ "GTK_DATABOX_TYPE_CROSS_SIMPLE", "gtkdatabox__cross__simple_8h.html#a800da74b31d9d310fc3cc30328aec0d9", null ], + [ "GtkDataboxCrossSimple", "gtkdatabox__cross__simple_8h.html#a604222cd10ee2f05314b943acf41d1f2", null ], + [ "GtkDataboxCrossSimpleClass", "gtkdatabox__cross__simple_8h.html#a683fd685bd900e193e8cbfa9becc0543", null ], + [ "GtkDataboxCrossSimplePrivate", "gtkdatabox__cross__simple_8h.html#af4390009b955ddaf43af7c71f9f3d690", null ], + [ "gtk_databox_cross_simple_get_type", "gtkdatabox__cross__simple_8h.html#abe1334309f941b48a84153df9d13dfe3", null ], + [ "gtk_databox_cross_simple_new", "gtkdatabox__cross__simple_8h.html#ab818cbbf158ea66ef3bcaf06a584c01c", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__dep__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +3ddb1a9411920b555dd2b0351c6e9c8f \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +a24d59a79454d4c6801b017ec143b85c \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +5c922b97ea0e57088975f6dbca9df25f \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_ab818cbbf158ea66ef3bcaf06a584c01c_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__cross__simple_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__cross__simple_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,194 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_cross_simple.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_cross_simple.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_cross_simple.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00033 #ifndef __GTK_DATABOX_CROSS_SIMPLE_H__
+00034 #define __GTK_DATABOX_CROSS_SIMPLE_H__
+00035 
+00036 #include <gtkdatabox_markers.h>
+00037 
+00038 G_BEGIN_DECLS
+00039 #define GTK_DATABOX_TYPE_CROSS_SIMPLE             (gtk_databox_cross_simple_get_type ())
+00040 #define GTK_DATABOX_CROSS_SIMPLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00041                                            GTK_DATABOX_TYPE_CROSS_SIMPLE, \
+00042                                            GtkDataboxCrossSimple))
+00043 #define GTK_DATABOX_CROSS_SIMPLE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00044                                            GTK_DATABOX_TYPE_CROSS_SIMPLE, \
+00045                                            GtkDataboxCrossSimpleClass))
+00046 #define GTK_DATABOX_IS_CROSS_SIMPLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00047                                            GTK_DATABOX_TYPE_CROSS_SIMPLE))
+00048 #define GTK_DATABOX_IS_CROSS_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00049                                            GTK_DATABOX_TYPE_CROSS_SIMPLE))
+00050 #define GTK_DATABOX_CROSS_SIMPLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00051                                            GTK_DATABOX_TYPE_CROSS_SIMPLE, \
+00052                                            GtkDataboxCrossSimpleClass))
+00053 
+00065    typedef struct _GtkDataboxCrossSimple GtkDataboxCrossSimple;
+00066 
+00067    typedef struct _GtkDataboxCrossSimpleClass GtkDataboxCrossSimpleClass;
+00068 
+00076    typedef struct _GtkDataboxCrossSimplePrivate GtkDataboxCrossSimplePrivate;
+00077 
+00078    struct _GtkDataboxCrossSimple
+00079    {
+00080       /*< private >*/
+00081       GtkDataboxMarkers parent;
+00082 
+00083       GtkDataboxCrossSimplePrivate *priv;
+00084    };
+00085 
+00086    struct _GtkDataboxCrossSimpleClass
+00087    {
+00088       GtkDataboxMarkersClass parent_class;
+00089    };
+00090 
+00091    GType gtk_databox_cross_simple_get_type (void);
+00092 
+00093    GtkDataboxGraph *gtk_databox_cross_simple_new (GdkColor * color,
+00094                                                   guint size);
+00095 
+00096 G_END_DECLS
+00097 #endif                          /* __GTK_DATABOX_CROSS_SIMPLE_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,523 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_graph.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Enumerations | +Functions
+
+
gtk/gtkdatabox_graph.c File Reference
+
+
+
#include <gtkdatabox_graph.h>
+#include <gtk/gtkstyle.h>
+#include <gtk/gtkgc.h>
+
+Include dependency graph for gtkdatabox_graph.c:
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxGraphPrivate

+Enumerations

enum  { GRAPH_COLOR = 1, +GRAPH_SIZE, +GRAPH_HIDE + }

+Functions

GdkGC * gtk_databox_graph_create_gc (GtkDataboxGraph *graph, GtkDatabox *box)
GType gtk_databox_graph_get_type (void)
void gtk_databox_graph_draw (GtkDataboxGraph *graph, GtkDatabox *box)
gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph *graph, gfloat *min_x, gfloat *max_x, gfloat *min_y, gfloat *max_y)
void gtk_databox_graph_set_color (GtkDataboxGraph *graph, GdkColor *color)
GdkColor * gtk_databox_graph_get_color (GtkDataboxGraph *graph)
void gtk_databox_graph_set_size (GtkDataboxGraph *graph, gint size)
gint gtk_databox_graph_get_size (GtkDataboxGraph *graph)
void gtk_databox_graph_set_gc (GtkDataboxGraph *graph, GdkGC *gc)
GdkGC * gtk_databox_graph_get_gc (GtkDataboxGraph *graph)
void gtk_databox_graph_set_hide (GtkDataboxGraph *graph, gboolean hide)
gboolean gtk_databox_graph_get_hide (GtkDataboxGraph *graph)
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + +
GRAPH_COLOR  +
GRAPH_SIZE  +
GRAPH_HIDE  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph * graph,
gfloat * min_x,
gfloat * max_x,
gfloat * min_y,
gfloat * max_y 
)
+
+
+

gtk_databox_graph_calculate_extrema: : A GtkDataboxGraph object : Will be filled with the lowest x value of the dataset : Will be filled with the highest x value of the dataset : Will be filled with the lowest y value of the dataset : Will be filled with the highest y value of the dataset

+

Virtual function which determines the minimum and maximum x and y values of the values of this GtkDataboxGraph object if applicable (there are graphs which do not contain data).

+

Return value: 0 on success, -1 if no data is available,

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
GdkGC* gtk_databox_graph_create_gc (GtkDataboxGraph * graph,
GtkDatabox * box 
)
+
+
+

gtk_databox_graph_create_gc: : A GtkDataboxGraph object : A GtkDatabox object

+

Virtual function which creates a graphics context for the .

+

Typically called by derived graph objects when the graphics context is needed for the first time.

+

Return value: The new graphics context.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_draw (GtkDataboxGraph * graph,
GtkDatabox * box 
)
+
+
+

gtk_databox_graph_draw: : A GtkDataboxGraph object : A GtkDatabox object

+

Virtual function which draws the GtkDataboxGraph on the drawing area of the GtkDatabox object.

+

Typically this function is called by GtkDatabox objects.

+ +
+
+ +
+
+ + + + + + + + +
GdkColor* gtk_databox_graph_get_color (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_color: : A GtkDataboxGraph object

+

Gets the current color of the graph elements (e.g. points).

+

Return value: The color of the graph.

+ +
+
+ +
+
+ + + + + + + + +
GdkGC* gtk_databox_graph_get_gc (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_gc: : A GtkDataboxGraph object

+

Gets the current graphics context of the graph.

+

Return value: The current graphics context of the graph.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_graph_get_hide (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_hide: : A GtkDataboxGraph object

+

Gets the current "hide" status.

+

Return value: Whether the graph is hidden (true) or not (false).

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_graph_get_size (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_size: : A GtkDataboxGraph object

+

Gets the size of the graph elements (e.g. the line width).

+

Return value: size of the graph elements

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_graph_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_color (GtkDataboxGraph * graph,
GdkColor * color 
)
+
+
+

gtk_databox_graph_set_color: : A GtkDataboxGraph object : Color which is to be used by the graph object

+

Sets the color which the GtkDataboxGraph object is supposed to be using when drawing itself.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_gc (GtkDataboxGraph * graph,
GdkGC * gc 
)
+
+
+

gtk_databox_graph_set_gc: : A GtkDataboxGraph object : Graphics contex for the graph object

+

Sets the graphics context which the GtkDataboxGraph object is supposed to be using when drawing itself.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_hide (GtkDataboxGraph * graph,
gboolean hide 
)
+
+
+

gtk_databox_graph_set_hide: : A GtkDataboxGraph object : Declares whether should be hidden (true) or not (false).

+

Hidden graphs are not shown, when the GtkDatabox containing them is redrawn.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_size (GtkDataboxGraph * graph,
gint size 
)
+
+
+

gtk_databox_graph_set_size: : A GtkDataboxGraph object : Size of graph elements for the graph object

+

Sets the size (e.g. line width) which the GtkDataboxGraph object is supposed to be using when drawing itself.

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,25 @@ +var gtkdatabox__graph_8c = +[ + [ "graph_finalize", "gtkdatabox__graph_8c.html#a30c2aecee14b4f413d96d5dc751c1cc7", null ], + [ "gtk_databox_graph_calculate_extrema", "gtkdatabox__graph_8c.html#ac39b934ccd3e576313a11d1288cfb10f", null ], + [ "gtk_databox_graph_class_init", "gtkdatabox__graph_8c.html#a595d13ee3f9897806c84ffa1f35576da", null ], + [ "gtk_databox_graph_create_gc", "gtkdatabox__graph_8c.html#a13c7918cf5363db6cc594bf1a381b081", null ], + [ "gtk_databox_graph_delete_gc", "gtkdatabox__graph_8c.html#a1416f289cc21eff3de55c01fbc9de13f", null ], + [ "gtk_databox_graph_draw", "gtkdatabox__graph_8c.html#ab6a0b370f18338b1aef0116f21907584", null ], + [ "gtk_databox_graph_get_color", "gtkdatabox__graph_8c.html#a6b771b211e918a7b9a6100a37061d1ab", null ], + [ "gtk_databox_graph_get_gc", "gtkdatabox__graph_8c.html#a39260b1c2cfb2f5110869eb98d0c1ad2", null ], + [ "gtk_databox_graph_get_hide", "gtkdatabox__graph_8c.html#afa8f43f2d40e60043a4e91cc55dbcbca", null ], + [ "gtk_databox_graph_get_property", "gtkdatabox__graph_8c.html#a1efe4357b40ef3c31b97badddceb57fb", null ], + [ "gtk_databox_graph_get_size", "gtkdatabox__graph_8c.html#a1af5bcf7d450166c651103e923a7cac4", null ], + [ "gtk_databox_graph_get_type", "gtkdatabox__graph_8c.html#acdfa9226b5730c39f9060f72a5b44eaa", null ], + [ "gtk_databox_graph_instance_init", "gtkdatabox__graph_8c.html#ac86523a6c5e1cf7e3b6efd8623e51bf2", null ], + [ "gtk_databox_graph_real_calculate_extrema", "gtkdatabox__graph_8c.html#abac14baf95b32d797ced39c827bf1978", null ], + [ "gtk_databox_graph_real_create_gc", "gtkdatabox__graph_8c.html#aef0f0f72139705e8762bd7e943e5f225", null ], + [ "gtk_databox_graph_real_draw", "gtkdatabox__graph_8c.html#a905a58b118eabcfb9594470c181494d5", null ], + [ "gtk_databox_graph_set_color", "gtkdatabox__graph_8c.html#aa114051fbdb1729e7f062558fe504a4f", null ], + [ "gtk_databox_graph_set_gc", "gtkdatabox__graph_8c.html#a2d81a2fdce4974a1c6f9fd45960590c8", null ], + [ "gtk_databox_graph_set_hide", "gtkdatabox__graph_8c.html#a3b567cebccbe73606b0407afa1529bc0", null ], + [ "gtk_databox_graph_set_property", "gtkdatabox__graph_8c.html#a58c2f73dd4c877e690db7799f699ab2d", null ], + [ "gtk_databox_graph_set_size", "gtkdatabox__graph_8c.html#a4733145428b179f810735d9c848485a3", null ], + [ "parent_class", "gtkdatabox__graph_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +4ab0171883444878829465e882a428b6 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +63f04a174b98d50740dff040a616d75e \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8c_ac39b934ccd3e576313a11d1288cfb10f_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,663 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_graph.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_graph.h File Reference
+
+
+
#include <gtk/gtkstyle.h>
+#include <gdk/gdk.h>
+#include <pango/pango.h>
+#include <gtkdatabox.h>
+
+Include dependency graph for gtkdatabox_graph.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxGraph
struct  _GtkDataboxGraphClass

+Defines

#define GTK_DATABOX_TYPE_GRAPH   (gtk_databox_graph_get_type ())
#define GTK_DATABOX_GRAPH(obj)
#define GTK_DATABOX_GRAPH_CLASS(klass)
#define GTK_DATABOX_IS_GRAPH(obj)
#define GTK_DATABOX_IS_GRAPH_CLASS(klass)
#define GTK_DATABOX_GRAPH_GET_CLASS(obj)

+Typedefs

typedef struct
+_GtkDataboxGraphClass 		GtkDataboxGraphClass
typedef struct
+_GtkDataboxGraphPrivate 		GtkDataboxGraphPrivate

+Functions

GType gtk_databox_graph_get_type (void)
GdkGC * gtk_databox_graph_get_gc (GtkDataboxGraph *graph)
void gtk_databox_graph_set_gc (GtkDataboxGraph *graph, GdkGC *gc)
void gtk_databox_graph_set_hide (GtkDataboxGraph *graph, gboolean hide)
gboolean gtk_databox_graph_get_hide (GtkDataboxGraph *graph)
void gtk_databox_graph_set_color (GtkDataboxGraph *graph, GdkColor *color)
GdkColor * gtk_databox_graph_get_color (GtkDataboxGraph *graph)
void gtk_databox_graph_set_size (GtkDataboxGraph *graph, gint size)
gint gtk_databox_graph_get_size (GtkDataboxGraph *graph)
gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph *graph, gfloat *min_x, gfloat *max_x, gfloat *min_y, gfloat *max_y)
void gtk_databox_graph_draw (GtkDataboxGraph *graph, GtkDatabox *box)
GdkGC * gtk_databox_graph_create_gc (GtkDataboxGraph *graph, GtkDatabox *box)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GRAPH( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_GRAPH, \
+                                           GtkDataboxGraph))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GRAPH_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_GRAPH, \
+                                           GtkDataboxGraphClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GRAPH_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_GRAPH, \
+                                           GtkDataboxGraphClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_GRAPH( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_GRAPH))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_GRAPH_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_GRAPH))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_GRAPH   (gtk_databox_graph_get_type ())
+
+
+

SECTION:gtkdatabox_graph : An abstract anchestor for all "real" graphs. gtkdatabox_graph.h : GtkDatabox, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxGrid, GtkDataboxCrossSimple

+

GtkDataboxGraphs can display data or other things in a GtkDatabox widget.

+

This class is just the basic interface. Other graph classes are derived from this class and implement some real things.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxGraphClass GtkDataboxGraphClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxGraphPrivate GtkDataboxGraphPrivate
+
+
+

GtkDataboxGraphPrivate

+

A private data structure used by the GtkDataboxGraph. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph * graph,
gfloat * min_x,
gfloat * max_x,
gfloat * min_y,
gfloat * max_y 
)
+
+
+

gtk_databox_graph_calculate_extrema: : A GtkDataboxGraph object : Will be filled with the lowest x value of the dataset : Will be filled with the highest x value of the dataset : Will be filled with the lowest y value of the dataset : Will be filled with the highest y value of the dataset

+

Virtual function which determines the minimum and maximum x and y values of the values of this GtkDataboxGraph object if applicable (there are graphs which do not contain data).

+

Return value: 0 on success, -1 if no data is available,

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
GdkGC* gtk_databox_graph_create_gc (GtkDataboxGraph * graph,
GtkDatabox * box 
)
+
+
+

gtk_databox_graph_create_gc: : A GtkDataboxGraph object : A GtkDatabox object

+

Virtual function which creates a graphics context for the .

+

Typically called by derived graph objects when the graphics context is needed for the first time.

+

Return value: The new graphics context.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_draw (GtkDataboxGraph * graph,
GtkDatabox * box 
)
+
+
+

gtk_databox_graph_draw: : A GtkDataboxGraph object : A GtkDatabox object

+

Virtual function which draws the GtkDataboxGraph on the drawing area of the GtkDatabox object.

+

Typically this function is called by GtkDatabox objects.

+ +
+
+ +
+
+ + + + + + + + +
GdkColor* gtk_databox_graph_get_color (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_color: : A GtkDataboxGraph object

+

Gets the current color of the graph elements (e.g. points).

+

Return value: The color of the graph.

+ +
+
+ +
+
+ + + + + + + + +
GdkGC* gtk_databox_graph_get_gc (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_gc: : A GtkDataboxGraph object

+

Gets the current graphics context of the graph.

+

Return value: The current graphics context of the graph.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_graph_get_hide (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_hide: : A GtkDataboxGraph object

+

Gets the current "hide" status.

+

Return value: Whether the graph is hidden (true) or not (false).

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_graph_get_size (GtkDataboxGraph * graph)
+
+
+

gtk_databox_graph_get_size: : A GtkDataboxGraph object

+

Gets the size of the graph elements (e.g. the line width).

+

Return value: size of the graph elements

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_graph_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_color (GtkDataboxGraph * graph,
GdkColor * color 
)
+
+
+

gtk_databox_graph_set_color: : A GtkDataboxGraph object : Color which is to be used by the graph object

+

Sets the color which the GtkDataboxGraph object is supposed to be using when drawing itself.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_gc (GtkDataboxGraph * graph,
GdkGC * gc 
)
+
+
+

gtk_databox_graph_set_gc: : A GtkDataboxGraph object : Graphics contex for the graph object

+

Sets the graphics context which the GtkDataboxGraph object is supposed to be using when drawing itself.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_hide (GtkDataboxGraph * graph,
gboolean hide 
)
+
+
+

gtk_databox_graph_set_hide: : A GtkDataboxGraph object : Declares whether should be hidden (true) or not (false).

+

Hidden graphs are not shown, when the GtkDatabox containing them is redrawn.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_graph_set_size (GtkDataboxGraph * graph,
gint size 
)
+
+
+

gtk_databox_graph_set_size: : A GtkDataboxGraph object : Size of graph elements for the graph object

+

Sets the size (e.g. line width) which the GtkDataboxGraph object is supposed to be using when drawing itself.

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,23 @@ +var gtkdatabox__graph_8h = +[ + [ "GTK_DATABOX_GRAPH", "gtkdatabox__graph_8h.html#ab1f775633184b997d4dd65b23be2c204", null ], + [ "GTK_DATABOX_GRAPH_CLASS", "gtkdatabox__graph_8h.html#acf414109857c196a082b947d35c8de30", null ], + [ "GTK_DATABOX_GRAPH_GET_CLASS", "gtkdatabox__graph_8h.html#a10145279fa6b2ec0bbdf49049b25dd1c", null ], + [ "GTK_DATABOX_IS_GRAPH", "gtkdatabox__graph_8h.html#ad0ed75d3ecfccae29202a0b57cf63f0f", null ], + [ "GTK_DATABOX_IS_GRAPH_CLASS", "gtkdatabox__graph_8h.html#a08f2dd7e139be683dde9e08e92550ca6", null ], + [ "GTK_DATABOX_TYPE_GRAPH", "gtkdatabox__graph_8h.html#a4bc2166652b0978f0cf4bbde9e6ac4d7", null ], + [ "GtkDataboxGraphClass", "gtkdatabox__graph_8h.html#a43ae83aea9183201cfe63dbd3e181a5e", null ], + [ "GtkDataboxGraphPrivate", "gtkdatabox__graph_8h.html#a95dc1041bc854a03cdb6792767548909", null ], + [ "gtk_databox_graph_calculate_extrema", "gtkdatabox__graph_8h.html#ac39b934ccd3e576313a11d1288cfb10f", null ], + [ "gtk_databox_graph_create_gc", "gtkdatabox__graph_8h.html#a13c7918cf5363db6cc594bf1a381b081", null ], + [ "gtk_databox_graph_draw", "gtkdatabox__graph_8h.html#ab6a0b370f18338b1aef0116f21907584", null ], + [ "gtk_databox_graph_get_color", "gtkdatabox__graph_8h.html#a6b771b211e918a7b9a6100a37061d1ab", null ], + [ "gtk_databox_graph_get_gc", "gtkdatabox__graph_8h.html#a39260b1c2cfb2f5110869eb98d0c1ad2", null ], + [ "gtk_databox_graph_get_hide", "gtkdatabox__graph_8h.html#afa8f43f2d40e60043a4e91cc55dbcbca", null ], + [ "gtk_databox_graph_get_size", "gtkdatabox__graph_8h.html#a1af5bcf7d450166c651103e923a7cac4", null ], + [ "gtk_databox_graph_get_type", "gtkdatabox__graph_8h.html#acdfa9226b5730c39f9060f72a5b44eaa", null ], + [ "gtk_databox_graph_set_color", "gtkdatabox__graph_8h.html#aa114051fbdb1729e7f062558fe504a4f", null ], + [ "gtk_databox_graph_set_gc", "gtkdatabox__graph_8h.html#a2d81a2fdce4974a1c6f9fd45960590c8", null ], + [ "gtk_databox_graph_set_hide", "gtkdatabox__graph_8h.html#a3b567cebccbe73606b0407afa1529bc0", null ], + [ "gtk_databox_graph_set_size", "gtkdatabox__graph_8h.html#a4733145428b179f810735d9c848485a3", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__dep__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +05813f0545f5cf822671a12172ce11ec \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +34996a1013c077f97d6c53a7227c7f94 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +63f04a174b98d50740dff040a616d75e \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_ac39b934ccd3e576313a11d1288cfb10f_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__graph_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__graph_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,224 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_graph.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_graph.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_graph.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00034 #ifndef __GTK_DATABOX_GRAPH_H__
+00035 #define __GTK_DATABOX_GRAPH_H__
+00036 
+00037 #include <gtk/gtkstyle.h>
+00038 #include <gdk/gdk.h>
+00039 #include <pango/pango.h>
+00040 #include <gtkdatabox.h>
+00041 
+00042 G_BEGIN_DECLS
+00043 #define GTK_DATABOX_TYPE_GRAPH            (gtk_databox_graph_get_type ())
+00044 #define GTK_DATABOX_GRAPH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00045                                            GTK_DATABOX_TYPE_GRAPH, \
+00046                                            GtkDataboxGraph))
+00047 #define GTK_DATABOX_GRAPH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00048                                            GTK_DATABOX_TYPE_GRAPH, \
+00049                                            GtkDataboxGraphClass))
+00050 #define GTK_DATABOX_IS_GRAPH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00051                                            GTK_DATABOX_TYPE_GRAPH))
+00052 #define GTK_DATABOX_IS_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00053                                            GTK_DATABOX_TYPE_GRAPH))
+00054 #define GTK_DATABOX_GRAPH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00055                                            GTK_DATABOX_TYPE_GRAPH, \
+00056                                            GtkDataboxGraphClass))
+00057 
+00058    typedef struct _GtkDataboxGraphClass GtkDataboxGraphClass;
+00059 
+00067    typedef struct _GtkDataboxGraphPrivate GtkDataboxGraphPrivate;
+00068 
+00077    struct _GtkDataboxGraph
+00078    {
+00079       /*< private >*/
+00080       GObject parent;
+00081 
+00082       GtkDataboxGraphPrivate *priv;
+00083    };
+00084 
+00085    struct _GtkDataboxGraphClass
+00086    {
+00087       GObjectClass parent_class;
+00088 
+00089       /*
+00090        * public virtual drawing function 
+00091        */
+00092       void (*draw) (GtkDataboxGraph * graph, GtkDatabox * box);
+00093 
+00094       gint (*calculate_extrema) (GtkDataboxGraph * graph,
+00095                                  gfloat * min_x, gfloat * max_x,
+00096                                  gfloat * min_y, gfloat * max_y);
+00097       GdkGC* (*create_gc) (GtkDataboxGraph * graph, GtkDatabox * box);
+00098    };
+00099 
+00100    GType gtk_databox_graph_get_type (void);
+00101 
+00102    GdkGC* gtk_databox_graph_get_gc (GtkDataboxGraph * graph);
+00103    void gtk_databox_graph_set_gc (GtkDataboxGraph * graph, GdkGC *gc);
+00104 
+00105    void gtk_databox_graph_set_hide (GtkDataboxGraph * graph, gboolean hide);
+00106    gboolean gtk_databox_graph_get_hide (GtkDataboxGraph * graph);
+00107 
+00108    void gtk_databox_graph_set_color (GtkDataboxGraph * graph,
+00109                                      GdkColor * color);
+00110    GdkColor *gtk_databox_graph_get_color (GtkDataboxGraph * graph);
+00111 
+00112    void gtk_databox_graph_set_size (GtkDataboxGraph * graph, gint size);
+00113    gint gtk_databox_graph_get_size (GtkDataboxGraph * graph);
+00114 
+00115    gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph * graph,
+00116                                              gfloat * min_x, gfloat * max_x,
+00117                                              gfloat * min_y, gfloat * max_y);
+00118    /* This function is called by GtkDatabox */
+00119    void gtk_databox_graph_draw (GtkDataboxGraph * graph, GtkDatabox * box);
+00120 
+00121    /* This function is called by derived graph classes */
+00122    GdkGC* gtk_databox_graph_create_gc (GtkDataboxGraph * graph, GtkDatabox * box);
+00123 
+00124 G_END_DECLS
+00125 #endif                          /* __GTK_DATABOX_GRAPH_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,501 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_grid.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Enumerations | +Functions
+
+
gtk/gtkdatabox_grid.c File Reference
+
+
+
#include <gtkdatabox_grid.h>
+
+Include dependency graph for gtkdatabox_grid.c:
+
+
+ + +
+
+ + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxGridPrivate

+Enumerations

enum  { GRID_HLINES = 1, +GRID_VLINES, +GRID_HLINE_VALS, +GRID_VLINE_VALS + }

+Functions

GType gtk_databox_grid_get_type (void)
GtkDataboxGraph * gtk_databox_grid_new (gint hlines, gint vlines, GdkColor *color, guint size)
GtkDataboxGraph * gtk_databox_grid_array_new (gint hlines, gint vlines, gfloat *local_hline_vals, gfloat *local_vline_vals, GdkColor *color, guint size)
void gtk_databox_grid_set_hlines (GtkDataboxGrid *grid, gint hlines)
gint gtk_databox_grid_get_hlines (GtkDataboxGrid *grid)
void gtk_databox_grid_set_vlines (GtkDataboxGrid *grid, gint vlines)
gint gtk_databox_grid_get_vlines (GtkDataboxGrid *grid)
void gtk_databox_grid_set_hline_vals (GtkDataboxGrid *grid, gfloat *hline_vals)
gfloat * gtk_databox_grid_get_hline_vals (GtkDataboxGrid *grid)
void gtk_databox_grid_set_vline_vals (GtkDataboxGrid *grid, gfloat *vline_vals)
gfloat * gtk_databox_grid_get_vline_vals (GtkDataboxGrid *grid)
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + + +
GRID_HLINES  +
GRID_VLINES  +
GRID_HLINE_VALS  +
GRID_VLINE_VALS  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_grid_array_new (gint hlines,
gint vlines,
gfloat * local_hline_vals,
gfloat * local_vline_vals,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_grid_array_new: : number of horizontal lines in the grid : number of vertical lines in the grid : a pointer to an array of gfloat horizontal grid coordinate : a pointer to an array of gfloat vertical grid coordinate : color of the grid : line width of the grid

+

Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxGrid object

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_grid_get_hline_vals (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_hline_vals: : a GtkDataboxGrid graph object

+

Gets the pointer to the horizontal line values for the .

+

Return value: Pointer to the horizontal line values for the .

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_grid_get_hlines (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_hlines: : a GtkDataboxGrid graph object

+

Gets the number of horizontal lines in the .

+

Return value: Number of horizontal lines in the .

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_grid_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_grid_get_vline_vals (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_vline_vals: : a GtkDataboxGrid graph object

+

Gets the pointer to the vertical line values for the .

+

Return value: Pointer to the vertical line values for the .

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_grid_get_vlines (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_vlines: : a GtkDataboxGrid graph object

+

Gets the number of vertical lines in the .

+

Return value: Number of vertical lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_grid_new (gint hlines,
gint vlines,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_grid_new: : number of horizontal lines in the grid : number of vertical lines in the grid : color of the grid : line width of the grid

+

Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxGrid object

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_hline_vals (GtkDataboxGrid * grid,
gfloat * hline_vals 
)
+
+
+

gtk_databox_grid_set_hline_vals: : a GtkDataboxGrid graph object : sets the pointer to the hline values for the grid

+

Sets the pointer to the horizontal lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_hlines (GtkDataboxGrid * grid,
gint hlines 
)
+
+
+

gtk_databox_grid_set_hlines: : a GtkDataboxGrid graph object : number of vertical lines in the grid

+

Sets the number of horizontal lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_vline_vals (GtkDataboxGrid * grid,
gfloat * vline_vals 
)
+
+
+

gtk_databox_grid_set_vline_vals: : a GtkDataboxGrid graph object : sets the pointer to the vline values for the grid

+

Sets the pointer to the vertical lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_vlines (GtkDataboxGrid * grid,
gint vlines 
)
+
+
+

gtk_databox_grid_set_vlines: : a GtkDataboxGrid graph object : number of vertical lines in the grid

+

Sets the number of vertical lines in the .

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,22 @@ +var gtkdatabox__grid_8c = +[ + [ "grid_finalize", "gtkdatabox__grid_8c.html#aadf2b04f90ead90776dea4b3d0da3087", null ], + [ "gtk_databox_grid_array_new", "gtkdatabox__grid_8c.html#ab104706e934d95d175e54ec0d71aeecc", null ], + [ "gtk_databox_grid_class_init", "gtkdatabox__grid_8c.html#a38cfd362ee31e1b41fb87aceb8c0d98a", null ], + [ "gtk_databox_grid_get_hline_vals", "gtkdatabox__grid_8c.html#ac1665a1b49f642d580f877c448e7b428", null ], + [ "gtk_databox_grid_get_hlines", "gtkdatabox__grid_8c.html#a32c7e180afb2f7eb0c515d5caa1fca83", null ], + [ "gtk_databox_grid_get_property", "gtkdatabox__grid_8c.html#a7a0dfa2acb42de12758a1a126fb9a06a", null ], + [ "gtk_databox_grid_get_type", "gtkdatabox__grid_8c.html#ada92e2e7d393197a027ec8228cc21ea5", null ], + [ "gtk_databox_grid_get_vline_vals", "gtkdatabox__grid_8c.html#acb5be373c32ffc66b0f6a6e654918a46", null ], + [ "gtk_databox_grid_get_vlines", "gtkdatabox__grid_8c.html#aa206e9942c3a27cae287fea8ca911777", null ], + [ "gtk_databox_grid_instance_init", "gtkdatabox__grid_8c.html#ade5791c9b832fee8126a3bce9724327d", null ], + [ "gtk_databox_grid_new", "gtkdatabox__grid_8c.html#a237303f86c2ef011e379b20fbe42bbe7", null ], + [ "gtk_databox_grid_real_create_gc", "gtkdatabox__grid_8c.html#a64c5a42095a69a648e6145b91a8ffa0f", null ], + [ "gtk_databox_grid_real_draw", "gtkdatabox__grid_8c.html#af10ac423d94396ebad01af13d9b28ed0", null ], + [ "gtk_databox_grid_set_hline_vals", "gtkdatabox__grid_8c.html#a890d3dbdae9a5877cf6d55edbaaea449", null ], + [ "gtk_databox_grid_set_hlines", "gtkdatabox__grid_8c.html#a5514d881418dbd23b0d31fe3962d9a9e", null ], + [ "gtk_databox_grid_set_property", "gtkdatabox__grid_8c.html#a75334a5b8b840f4fc66dc152a67d5010", null ], + [ "gtk_databox_grid_set_vline_vals", "gtkdatabox__grid_8c.html#ab76a71a761281b26653c469d1cf2c9bf", null ], + [ "gtk_databox_grid_set_vlines", "gtkdatabox__grid_8c.html#ab180e04f43b6fd2b5d102fd748898400", null ], + [ "parent_class", "gtkdatabox__grid_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +37bcc429045622a3d71205badd188602 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,651 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_grid.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_grid.h File Reference
+
+
+
#include <gtkdatabox_graph.h>
+
+Include dependency graph for gtkdatabox_grid.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxGrid
struct  _GtkDataboxGridClass

+Defines

#define GTK_DATABOX_TYPE_GRID   (gtk_databox_grid_get_type ())
#define GTK_DATABOX_GRID(obj)
#define GTK_DATABOX_GRID_CLASS(klass)
#define GTK_DATABOX_IS_GRID(obj)
#define GTK_DATABOX_IS_GRID_CLASS(klass)
#define GTK_DATABOX_GRID_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxGrid GtkDataboxGrid
typedef struct _GtkDataboxGridClass GtkDataboxGridClass
typedef struct
+_GtkDataboxGridPrivate 		GtkDataboxGridPrivate

+Functions

GType gtk_databox_grid_get_type (void)
GtkDataboxGraph * gtk_databox_grid_new (gint hlines, gint vlines, GdkColor *color, guint size)
GtkDataboxGraph * gtk_databox_grid_array_new (gint hlines, gint vlines, gfloat *hline_vals, gfloat *vline_vals, GdkColor *color, guint size)
void gtk_databox_grid_set_hlines (GtkDataboxGrid *grid, gint hlines)
gint gtk_databox_grid_get_hlines (GtkDataboxGrid *grid)
void gtk_databox_grid_set_vlines (GtkDataboxGrid *grid, gint vlines)
gint gtk_databox_grid_get_vlines (GtkDataboxGrid *grid)
void gtk_databox_grid_set_hline_vals (GtkDataboxGrid *grid, gfloat *hline_vals)
gfloat * gtk_databox_grid_get_hline_vals (GtkDataboxGrid *grid)
void gtk_databox_grid_set_vline_vals (GtkDataboxGrid *grid, gfloat *vline_vals)
gfloat * gtk_databox_grid_get_vline_vals (GtkDataboxGrid *grid)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GRID( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_GRID, \
+                                           GtkDataboxGrid))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GRID_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_GRID, \
+                                           GtkDataboxGridClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_GRID_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_GRID, \
+                                           GtkDataboxGridClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_GRID( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_GRID))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_GRID_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_GRID))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_GRID   (gtk_databox_grid_get_type ())
+
+
+

SECTION:gtkdatabox_grid : A GtkDataboxGraph used for displaying a grid (like in an oscilloscope). gtkdatabox_grid.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers

+

GtkDataboxGrid is a GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxGrid GtkDataboxGrid
+
+
+

GtkDataboxGrid

+

GtkDataboxGrid is a GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxGridClass GtkDataboxGridClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxGridPrivate GtkDataboxGridPrivate
+
+
+

GtkDataboxGridPrivate

+

A private data structure used by the GtkDataboxGrid. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_grid_array_new (gint hlines,
gint vlines,
gfloat * local_hline_vals,
gfloat * local_vline_vals,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_grid_array_new: : number of horizontal lines in the grid : number of vertical lines in the grid : a pointer to an array of gfloat horizontal grid coordinate : a pointer to an array of gfloat vertical grid coordinate : color of the grid : line width of the grid

+

Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxGrid object

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_grid_get_hline_vals (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_hline_vals: : a GtkDataboxGrid graph object

+

Gets the pointer to the horizontal line values for the .

+

Return value: Pointer to the horizontal line values for the .

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_grid_get_hlines (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_hlines: : a GtkDataboxGrid graph object

+

Gets the number of horizontal lines in the .

+

Return value: Number of horizontal lines in the .

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_grid_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_grid_get_vline_vals (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_vline_vals: : a GtkDataboxGrid graph object

+

Gets the pointer to the vertical line values for the .

+

Return value: Pointer to the vertical line values for the .

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_grid_get_vlines (GtkDataboxGrid * grid)
+
+
+

gtk_databox_grid_get_vlines: : a GtkDataboxGrid graph object

+

Gets the number of vertical lines in the .

+

Return value: Number of vertical lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_grid_new (gint hlines,
gint vlines,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_grid_new: : number of horizontal lines in the grid : number of vertical lines in the grid : color of the grid : line width of the grid

+

Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxGrid object

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_hline_vals (GtkDataboxGrid * grid,
gfloat * hline_vals 
)
+
+
+

gtk_databox_grid_set_hline_vals: : a GtkDataboxGrid graph object : sets the pointer to the hline values for the grid

+

Sets the pointer to the horizontal lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_hlines (GtkDataboxGrid * grid,
gint hlines 
)
+
+
+

gtk_databox_grid_set_hlines: : a GtkDataboxGrid graph object : number of vertical lines in the grid

+

Sets the number of horizontal lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_vline_vals (GtkDataboxGrid * grid,
gfloat * vline_vals 
)
+
+
+

gtk_databox_grid_set_vline_vals: : a GtkDataboxGrid graph object : sets the pointer to the vline values for the grid

+

Sets the pointer to the vertical lines in the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_grid_set_vlines (GtkDataboxGrid * grid,
gint vlines 
)
+
+
+

gtk_databox_grid_set_vlines: : a GtkDataboxGrid graph object : number of vertical lines in the grid

+

Sets the number of vertical lines in the .

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,23 @@ +var gtkdatabox__grid_8h = +[ + [ "GTK_DATABOX_GRID", "gtkdatabox__grid_8h.html#a2b7baa3069e6cb0db6c18edfdfbb3399", null ], + [ "GTK_DATABOX_GRID_CLASS", "gtkdatabox__grid_8h.html#a0e948d72c9d5c4e3e3e347950fe5c9c5", null ], + [ "GTK_DATABOX_GRID_GET_CLASS", "gtkdatabox__grid_8h.html#a98f99ccdc50304a07dfe63250ede8de5", null ], + [ "GTK_DATABOX_IS_GRID", "gtkdatabox__grid_8h.html#acd75c42fff0607df926eef5c8533b3f7", null ], + [ "GTK_DATABOX_IS_GRID_CLASS", "gtkdatabox__grid_8h.html#a351892b6b5e51b35fbd386cea0cb8862", null ], + [ "GTK_DATABOX_TYPE_GRID", "gtkdatabox__grid_8h.html#ab4e9d459ab04b2b3f2aecec949c2fad8", null ], + [ "GtkDataboxGrid", "gtkdatabox__grid_8h.html#a31edf5096cc2fd7fc71e51bfe12390e9", null ], + [ "GtkDataboxGridClass", "gtkdatabox__grid_8h.html#ab9f14966309d810cfc51e531bbf6633d", null ], + [ "GtkDataboxGridPrivate", "gtkdatabox__grid_8h.html#a9ae30e87fa831ebab2094ab0b32205dd", null ], + [ "gtk_databox_grid_array_new", "gtkdatabox__grid_8h.html#ae91a3d3f93c9d3d6a891d94f2aae9556", null ], + [ "gtk_databox_grid_get_hline_vals", "gtkdatabox__grid_8h.html#ac1665a1b49f642d580f877c448e7b428", null ], + [ "gtk_databox_grid_get_hlines", "gtkdatabox__grid_8h.html#a32c7e180afb2f7eb0c515d5caa1fca83", null ], + [ "gtk_databox_grid_get_type", "gtkdatabox__grid_8h.html#ada92e2e7d393197a027ec8228cc21ea5", null ], + [ "gtk_databox_grid_get_vline_vals", "gtkdatabox__grid_8h.html#acb5be373c32ffc66b0f6a6e654918a46", null ], + [ "gtk_databox_grid_get_vlines", "gtkdatabox__grid_8h.html#aa206e9942c3a27cae287fea8ca911777", null ], + [ "gtk_databox_grid_new", "gtkdatabox__grid_8h.html#a237303f86c2ef011e379b20fbe42bbe7", null ], + [ "gtk_databox_grid_set_hline_vals", "gtkdatabox__grid_8h.html#a890d3dbdae9a5877cf6d55edbaaea449", null ], + [ "gtk_databox_grid_set_hlines", "gtkdatabox__grid_8h.html#a5514d881418dbd23b0d31fe3962d9a9e", null ], + [ "gtk_databox_grid_set_vline_vals", "gtkdatabox__grid_8h.html#ab76a71a761281b26653c469d1cf2c9bf", null ], + [ "gtk_databox_grid_set_vlines", "gtkdatabox__grid_8h.html#ab180e04f43b6fd2b5d102fd748898400", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__dep__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +3edd0db89169acd8d7f8248080163237 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +bfd67ba3d9909132758576c72a3a28bf \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__grid_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__grid_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,207 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_grid.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_grid.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_grid.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  *
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  *
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00031 #ifndef __GTK_DATABOX_GRID_H__
+00032 #define __GTK_DATABOX_GRID_H__
+00033 
+00034 #include <gtkdatabox_graph.h>
+00035 
+00036 G_BEGIN_DECLS
+00037 #define GTK_DATABOX_TYPE_GRID             (gtk_databox_grid_get_type ())
+00038 #define GTK_DATABOX_GRID(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00039                                            GTK_DATABOX_TYPE_GRID, \
+00040                                            GtkDataboxGrid))
+00041 #define GTK_DATABOX_GRID_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00042                                            GTK_DATABOX_TYPE_GRID, \
+00043                                            GtkDataboxGridClass))
+00044 #define GTK_DATABOX_IS_GRID(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00045                                            GTK_DATABOX_TYPE_GRID))
+00046 #define GTK_DATABOX_IS_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00047                                            GTK_DATABOX_TYPE_GRID))
+00048 #define GTK_DATABOX_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00049                                            GTK_DATABOX_TYPE_GRID, \
+00050                                            GtkDataboxGridClass))
+00051 
+00060    typedef struct _GtkDataboxGrid GtkDataboxGrid;
+00061 
+00062    typedef struct _GtkDataboxGridClass GtkDataboxGridClass;
+00063 
+00071    typedef struct _GtkDataboxGridPrivate GtkDataboxGridPrivate;
+00072 
+00073    struct _GtkDataboxGrid
+00074    {
+00075       GtkDataboxGraph parent;
+00076 
+00077       GtkDataboxGridPrivate *priv;
+00078    };
+00079 
+00080    struct _GtkDataboxGridClass
+00081    {
+00082       GtkDataboxGraphClass parent_class;
+00083    };
+00084 
+00085    GType gtk_databox_grid_get_type (void);
+00086 
+00087    GtkDataboxGraph *gtk_databox_grid_new (gint hlines, gint vlines,
+00088                                           GdkColor * color, guint size);
+00089    GtkDataboxGraph *gtk_databox_grid_array_new (gint hlines, gint vlines, gfloat *hline_vals, gfloat *vline_vals,
+00090                                           GdkColor * color, guint size);
+00091 
+00092    void gtk_databox_grid_set_hlines (GtkDataboxGrid * grid, gint hlines);
+00093    gint gtk_databox_grid_get_hlines (GtkDataboxGrid * grid);
+00094 
+00095    void gtk_databox_grid_set_vlines (GtkDataboxGrid * grid, gint vlines);
+00096    gint gtk_databox_grid_get_vlines (GtkDataboxGrid * grid);
+00097 
+00098    void gtk_databox_grid_set_hline_vals (GtkDataboxGrid * grid, gfloat* hline_vals);
+00099    gfloat* gtk_databox_grid_get_hline_vals (GtkDataboxGrid * grid);
+00100 
+00101    void gtk_databox_grid_set_vline_vals (GtkDataboxGrid * grid, gfloat* vline_vals);
+00102    gfloat* gtk_databox_grid_get_vline_vals (GtkDataboxGrid * grid);
+00103 
+00104 G_END_DECLS
+00105 #endif                          /* __GTK_DATABOX_GRID_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,214 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_lines.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Functions
+
+
gtk/gtkdatabox_lines.c File Reference
+
+
+
#include <gtkdatabox_lines.h>
+
+Include dependency graph for gtkdatabox_lines.c:
+
+
+ + +
+
+ + + + + +

+Data Structures

struct  _GtkDataboxLinesPrivate

+Functions

GType gtk_databox_lines_get_type (void)
GtkDataboxGraph * gtk_databox_lines_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, guint size)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_lines_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_lines_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_lines_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxLines object which can be added to a GtkDatabox widget.

+

Return value: A new GtkDataboxLines object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,11 @@ +var gtkdatabox__lines_8c = +[ + [ "gtk_databox_lines_class_init", "gtkdatabox__lines_8c.html#abe15365393365c67c0df4b02701739db", null ], + [ "gtk_databox_lines_complete", "gtkdatabox__lines_8c.html#aeaa8ad069850f3a350f5c1a7627f0134", null ], + [ "gtk_databox_lines_get_type", "gtkdatabox__lines_8c.html#a4628baeab91b1f23914687ef0cc00bf8", null ], + [ "gtk_databox_lines_instance_init", "gtkdatabox__lines_8c.html#a36335f08e7858b0cd250066fd73df4d8", null ], + [ "gtk_databox_lines_new", "gtkdatabox__lines_8c.html#ae54c4690b9bb71b079196b370995a394", null ], + [ "gtk_databox_lines_real_draw", "gtkdatabox__lines_8c.html#addbc7ab7814e63200eec29af3d7db353", null ], + [ "lines_finalize", "gtkdatabox__lines_8c.html#a9d8a5ade07eb823d130687338ee51470", null ], + [ "parent_class", "gtkdatabox__lines_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +b05cc8399e1f3092961154838c821f2d \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,399 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_lines.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_lines.h File Reference
+
+
+
#include <gtkdatabox_xyc_graph.h>
+
+Include dependency graph for gtkdatabox_lines.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxLines
struct  _GtkDataboxLinesClass

+Defines

#define GTK_DATABOX_TYPE_LINES   (gtk_databox_lines_get_type ())
#define GTK_DATABOX_LINES(obj)
#define GTK_DATABOX_LINES_CLASS(klass)
#define GTK_DATABOX_IS_LINES(obj)
#define GTK_DATABOX_IS_LINES_CLASS(klass)
#define GTK_DATABOX_LINES_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxLines GtkDataboxLines
typedef struct
+_GtkDataboxLinesClass 		GtkDataboxLinesClass
typedef struct
+_GtkDataboxLinesPrivate 		GtkDataboxLinesPrivate

+Functions

GType gtk_databox_lines_get_type (void)
GtkDataboxGraph * gtk_databox_lines_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, guint size)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_LINES( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_LINES))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_LINES_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_LINES))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_LINES( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_LINES, \
+                                           GtkDataboxLines))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_LINES_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_LINES, \
+                                           GtkDataboxLinesClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_LINES_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_LINES, \
+                                           GtkDataboxLinesClass))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_LINES   (gtk_databox_lines_get_type ())
+
+
+

SECTION:gtkdatabox_lines : A GtkDataboxGraph used for displaying xy-values series of connected lines. gtkdatabox_lines.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxBars, GtkDataboxMarkers

+

GtkDataboxLines is a GtkDataboxGraph class for displaying xy-values as series of connected lines.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxLines GtkDataboxLines
+
+
+

GtkDataboxLines

+

GtkDataboxLines is a GtkDataboxGraph class for displaying xy-values as series of connected lines.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxLinesClass GtkDataboxLinesClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxLinesPrivate GtkDataboxLinesPrivate
+
+
+

GtkDataboxLinesPrivate : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxBars, GtkDataboxMarkers

+

A private data structure used by the GtkDataboxLines. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_lines_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_lines_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_lines_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxLines object which can be added to a GtkDatabox widget.

+

Return value: A new GtkDataboxLines object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var gtkdatabox__lines_8h = +[ + [ "GTK_DATABOX_IS_LINES", "gtkdatabox__lines_8h.html#a3dbb635377449f0e9e49a7afc638b67d", null ], + [ "GTK_DATABOX_IS_LINES_CLASS", "gtkdatabox__lines_8h.html#a5699dcdeea441d736b2083e1900a08ee", null ], + [ "GTK_DATABOX_LINES", "gtkdatabox__lines_8h.html#a0206754736f55c77a9dd5365638f2750", null ], + [ "GTK_DATABOX_LINES_CLASS", "gtkdatabox__lines_8h.html#a79e8f086380e34aec840ee978db2275a", null ], + [ "GTK_DATABOX_LINES_GET_CLASS", "gtkdatabox__lines_8h.html#a0ed2b38504285b9c5064353cf61b4ead", null ], + [ "GTK_DATABOX_TYPE_LINES", "gtkdatabox__lines_8h.html#aca325d7b24309e74060bee473f0fd8a2", null ], + [ "GtkDataboxLines", "gtkdatabox__lines_8h.html#a8a82bb7a6e20ee4691b2095678ef39b8", null ], + [ "GtkDataboxLinesClass", "gtkdatabox__lines_8h.html#a395f5f59b7d86ecedd428d0c3afeab44", null ], + [ "GtkDataboxLinesPrivate", "gtkdatabox__lines_8h.html#a655a5edfc559af44946036d4b172feae", null ], + [ "gtk_databox_lines_get_type", "gtkdatabox__lines_8h.html#a4628baeab91b1f23914687ef0cc00bf8", null ], + [ "gtk_databox_lines_new", "gtkdatabox__lines_8h.html#ae54c4690b9bb71b079196b370995a394", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__dep__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +45bbaf8fd3dd7ac643bb8e6c6b5c38b1 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__incl.map 2012-11-09 04:01:20.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +0d611ed0e4f9309ab38928644adaa6e7 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__lines_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__lines_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,194 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_lines.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_lines.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_lines.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00030 #ifndef __GTK_DATABOX_LINES_H__
+00031 #define __GTK_DATABOX_LINES_H__
+00032 
+00033 #include <gtkdatabox_xyc_graph.h>
+00034 
+00035 G_BEGIN_DECLS
+00036 #define GTK_DATABOX_TYPE_LINES            (gtk_databox_lines_get_type ())
+00037 #define GTK_DATABOX_LINES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00038                                            GTK_DATABOX_TYPE_LINES, \
+00039                                            GtkDataboxLines))
+00040 #define GTK_DATABOX_LINES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00041                                            GTK_DATABOX_TYPE_LINES, \
+00042                                            GtkDataboxLinesClass))
+00043 #define GTK_DATABOX_IS_LINES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00044                                            GTK_DATABOX_TYPE_LINES))
+00045 #define GTK_DATABOX_IS_LINES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00046                                            GTK_DATABOX_TYPE_LINES))
+00047 #define GTK_DATABOX_LINES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00048                                            GTK_DATABOX_TYPE_LINES, \
+00049                                            GtkDataboxLinesClass))
+00050 
+00057    typedef struct _GtkDataboxLines GtkDataboxLines;
+00058 
+00059    typedef struct _GtkDataboxLinesClass GtkDataboxLinesClass;
+00060 
+00069    typedef struct _GtkDataboxLinesPrivate GtkDataboxLinesPrivate;
+00070 
+00071    struct _GtkDataboxLines
+00072    {
+00073       /*< private >*/
+00074       GtkDataboxXYCGraph parent;
+00075 
+00076       GtkDataboxLinesPrivate *priv;
+00077    };
+00078 
+00079    struct _GtkDataboxLinesClass
+00080    {
+00081       GtkDataboxXYCGraphClass parent_class;
+00082    };
+00083 
+00084    GType gtk_databox_lines_get_type (void);
+00085 
+00086    GtkDataboxGraph *gtk_databox_lines_new (guint len, gfloat * X, gfloat * Y,
+00087                                            GdkColor * color, guint size);
+00088 
+00089 G_END_DECLS
+00090 #endif                          /* __GTK_DATABOX_LINES_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,367 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_markers.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Enumerations | +Functions
+
+
gtk/gtkdatabox_markers.c File Reference
+
+
+
#include <gtkdatabox_markers.h>
+#include <pango/pango.h>
+
+Include dependency graph for gtkdatabox_markers.c:
+
+
+ + +
+
+ + + + + + + + + + +

+Data Structures

struct  GtkDataboxMarkersInfo
struct  _GtkDataboxMarkersPrivate

+Enumerations

enum  { PROP_TYPE = 1 + }

+Functions

GType gtk_databox_markers_get_type (void)
GtkDataboxGraph * gtk_databox_markers_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, guint size, GtkDataboxMarkersType type)
void gtk_databox_markers_set_position (GtkDataboxMarkers *markers, guint index, GtkDataboxMarkersPosition position)
void gtk_databox_markers_set_label (GtkDataboxMarkers *markers, guint index, GtkDataboxMarkersTextPosition label_position, gchar *text, gboolean boxed)
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ +
PROP_TYPE  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_markers_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_markers_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
guint size,
GtkDataboxMarkersType type 
)
+
+
+

gtk_databox_markers_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the ) : type of markers (e.g. triangle or circle)

+

Creates a new GtkDataboxMarkers object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxMarkers object

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_markers_set_label (GtkDataboxMarkers * markers,
guint index,
GtkDataboxMarkersTextPosition label_position,
gchar * text,
gboolean boxed 
)
+
+
+

gtk_databox_markers_set_label: : A GtkDataboxMarkers object : index within the array of X/Y values : position of the label relative to the marker : text to be displayed in the label : Whether the label is to be enclosed in a box (true) or not (false)

+

Sets a label for one of the markers.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_markers_set_position (GtkDataboxMarkers * markers,
guint index,
GtkDataboxMarkersPosition position 
)
+
+
+

gtk_databox_markers_set_position: : A GtkDataboxMarkers object : index within the array of X/Y values : position of the marker (e.g. circle or triangle relative to their X/Y value

+

Sets a position for one of the markers.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,19 @@ +var gtkdatabox__markers_8c = +[ + [ "complete", "gtkdatabox__markers_8c.html#abaee3bfcf522bbddc6179fcb19f717b2", null ], + [ "gtk_databox_label_write_at", "gtkdatabox__markers_8c.html#a7a97e85681f3ae511df32c90b9acd913", null ], + [ "gtk_databox_markers_class_init", "gtkdatabox__markers_8c.html#a1870bc17b514a1f65f59648a5158d652", null ], + [ "gtk_databox_markers_get_mtype", "gtkdatabox__markers_8c.html#aa7417927c44aea8dc93346a3ada26280", null ], + [ "gtk_databox_markers_get_property", "gtkdatabox__markers_8c.html#a2a4e6b4d1fd979a2d9b3abba2c99462b", null ], + [ "gtk_databox_markers_get_type", "gtkdatabox__markers_8c.html#aa7365a9522c03e53772e103ea29e4559", null ], + [ "gtk_databox_markers_instance_init", "gtkdatabox__markers_8c.html#af38262b3313d07a6a620c6634542302e", null ], + [ "gtk_databox_markers_new", "gtkdatabox__markers_8c.html#a2fe335994a64934794b1ee2a3343c293", null ], + [ "gtk_databox_markers_real_create_gc", "gtkdatabox__markers_8c.html#a45303e0146a0207fefbf442cda07f19d", null ], + [ "gtk_databox_markers_real_draw", "gtkdatabox__markers_8c.html#a2aa22b68a08a9f8ee2869e236d00be47", null ], + [ "gtk_databox_markers_set_label", "gtkdatabox__markers_8c.html#abbeb1af4789491070e93bf07b7eae53f", null ], + [ "gtk_databox_markers_set_mtype", "gtkdatabox__markers_8c.html#a1de71add9f54f2074bf690ec5336bc6d", null ], + [ "gtk_databox_markers_set_position", "gtkdatabox__markers_8c.html#a8c7feba8c2204be9b75dbdaea21d4440", null ], + [ "gtk_databox_markers_set_property", "gtkdatabox__markers_8c.html#a1d4db620ed071c6d4b3efe5486b59833", null ], + [ "markers_finalize", "gtkdatabox__markers_8c.html#a67ff1956ebc567cd5f20571f8c3fb803", null ], + [ "parent_class", "gtkdatabox__markers_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +ddd1905c267dbcceb4bc1acb6c0b9258 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +62244d6731f13046e89ae5112b022478 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +3a15499f8c6b36af081d8674d9dff174 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +96f837bb4ce5aafa7c1982825b4063aa \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +eb882ff0f6bc370d216fded3686a0745 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8c_abbeb1af4789491070e93bf07b7eae53f_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,650 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_markers.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Enumerations | +Functions
+
+
gtk/gtkdatabox_markers.h File Reference
+
+
+
#include <gtkdatabox_xyc_graph.h>
+
+Include dependency graph for gtkdatabox_markers.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxMarkers
struct  _GtkDataboxMarkersClass

+Defines

#define GTK_DATABOX_TYPE_MARKERS   (gtk_databox_markers_get_type ())
#define GTK_DATABOX_MARKERS(obj)
#define GTK_DATABOX_MARKERS_CLASS(klass)
#define GTK_DATABOX_IS_MARKERS(obj)
#define GTK_DATABOX_IS_MARKERS_CLASS(klass)
#define GTK_DATABOX_MARKERS_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxMarkers GtkDataboxMarkers
typedef struct
+_GtkDataboxMarkersClass 		GtkDataboxMarkersClass
typedef struct
+_GtkDataboxMarkersPrivate 		GtkDataboxMarkersPrivate

+Enumerations

enum  GtkDataboxMarkersPosition {
+  GTK_DATABOX_MARKERS_C = 0, +GTK_DATABOX_MARKERS_N, +GTK_DATABOX_MARKERS_E, +GTK_DATABOX_MARKERS_S, +
+  GTK_DATABOX_MARKERS_W +
+ }
enum  GtkDataboxMarkersTextPosition {
+  GTK_DATABOX_MARKERS_TEXT_CENTER = 0, +GTK_DATABOX_MARKERS_TEXT_N, +GTK_DATABOX_MARKERS_TEXT_NE, +GTK_DATABOX_MARKERS_TEXT_E, +
+  GTK_DATABOX_MARKERS_TEXT_SE, +GTK_DATABOX_MARKERS_TEXT_S, +GTK_DATABOX_MARKERS_TEXT_SW, +GTK_DATABOX_MARKERS_TEXT_W, +
+  GTK_DATABOX_MARKERS_TEXT_NW +
+ }
enum  GtkDataboxMarkersType { GTK_DATABOX_MARKERS_NONE = 0, +GTK_DATABOX_MARKERS_TRIANGLE, +GTK_DATABOX_MARKERS_SOLID_LINE, +GTK_DATABOX_MARKERS_DASHED_LINE + }

+Functions

GType gtk_databox_markers_get_type (void)
GtkDataboxGraph * gtk_databox_markers_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, guint size, GtkDataboxMarkersType type)
void gtk_databox_markers_set_position (GtkDataboxMarkers *markers, guint index, GtkDataboxMarkersPosition position)
void gtk_databox_markers_set_label (GtkDataboxMarkers *markers, guint index, GtkDataboxMarkersTextPosition label_position, gchar *text, gboolean boxed)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_MARKERS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_MARKERS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_MARKERS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_MARKERS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_MARKERS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_MARKERS, \
+                                           GtkDataboxMarkers))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_MARKERS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_MARKERS, \
+                                           GtkDataboxMarkersClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_MARKERS_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_MARKERS, \
+                                           GtkDataboxMarkersClass))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_MARKERS   (gtk_databox_markers_get_type ())
+
+
+

SECTION:gtkdatabox_markers : A GtkDataboxGraph used for displaying labeled markers for xy-values. gtkdatabox_markers.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars

+

GtkDataboxMarkers is a GtkDataboxGraph class for displaying labeled markers (circles, triangles, lines) for xy-values.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxMarkers GtkDataboxMarkers
+
+
+

GtkDataboxMarkers: : The parent object : A private structure containing internal data.

+

GtkDataboxMarkers is a GtkDataboxGraph class for displaying labeled markers (circles, triangles, lines) for xy-values.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxMarkersClass GtkDataboxMarkersClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxMarkersPrivate GtkDataboxMarkersPrivate
+
+
+

GtkDataboxMarkersPrivate:

+

A private data structure used by the GtkDataboxMarkers. It shields all internal things from developers who are just using the object.

+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum GtkDataboxMarkersPosition
+
+
+

GtkDataboxMarkersPosition: : centered on data : marker is positioned north of data : marker is positioned east of data : marker is positioned south of data : marker is positioned west of data

+

Position of a marker relative to its respective X/Y value.

+
Enumerator:
+ + + + + +
GTK_DATABOX_MARKERS_C  +
GTK_DATABOX_MARKERS_N  +
GTK_DATABOX_MARKERS_E  +
GTK_DATABOX_MARKERS_S  +
GTK_DATABOX_MARKERS_W  +
+
+
+ +
+
+ +
+
+ + + + +
enum GtkDataboxMarkersTextPosition
+
+
+

GtkDataboxMarkersTextPosition: : text centered on marker : text north of marker : text north-east of marker : text east of marker : text south-east of marker : text south of marker : text south-west of marker : text west of marker : text north-west of marker

+

Position of a label relative to its repective marker.

+
Enumerator:
+ + + + + + + + + +
GTK_DATABOX_MARKERS_TEXT_CENTER  +
GTK_DATABOX_MARKERS_TEXT_N  +
GTK_DATABOX_MARKERS_TEXT_NE  +
GTK_DATABOX_MARKERS_TEXT_E  +
GTK_DATABOX_MARKERS_TEXT_SE  +
GTK_DATABOX_MARKERS_TEXT_S  +
GTK_DATABOX_MARKERS_TEXT_SW  +
GTK_DATABOX_MARKERS_TEXT_W  +
GTK_DATABOX_MARKERS_TEXT_NW  +
+
+
+ +
+
+ +
+
+ + + + +
enum GtkDataboxMarkersType
+
+
+

GtkDataboxMarkersType: : No Marker (just text) : Marker is a triangle : Marker is a solid line : Marker is a dashed line

+

Type of the marker

+
Enumerator:
+ + + + +
GTK_DATABOX_MARKERS_NONE  +
GTK_DATABOX_MARKERS_TRIANGLE  +
GTK_DATABOX_MARKERS_SOLID_LINE  +
GTK_DATABOX_MARKERS_DASHED_LINE  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_markers_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_markers_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
guint size,
GtkDataboxMarkersType type 
)
+
+
+

gtk_databox_markers_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the ) : type of markers (e.g. triangle or circle)

+

Creates a new GtkDataboxMarkers object which can be added to a GtkDatabox widget as nice decoration for other graphs.

+

Return value: A new GtkDataboxMarkers object

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_markers_set_label (GtkDataboxMarkers * markers,
guint index,
GtkDataboxMarkersTextPosition label_position,
gchar * text,
gboolean boxed 
)
+
+
+

gtk_databox_markers_set_label: : A GtkDataboxMarkers object : index within the array of X/Y values : position of the label relative to the marker : text to be displayed in the label : Whether the label is to be enclosed in a box (true) or not (false)

+

Sets a label for one of the markers.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_markers_set_position (GtkDataboxMarkers * markers,
guint index,
GtkDataboxMarkersPosition position 
)
+
+
+

gtk_databox_markers_set_position: : A GtkDataboxMarkers object : index within the array of X/Y values : position of the marker (e.g. circle or triangle relative to their X/Y value

+

Sets a position for one of the markers.

+ +

+Here is the call graph for this function:
+
+
+ + +
+

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,19 @@ +var gtkdatabox__markers_8h = +[ + [ "GTK_DATABOX_IS_MARKERS", "gtkdatabox__markers_8h.html#ac62146f2dfa2bdd1553324193700d51b", null ], + [ "GTK_DATABOX_IS_MARKERS_CLASS", "gtkdatabox__markers_8h.html#a4cc8f0699daf1a9e899fffabf595183f", null ], + [ "GTK_DATABOX_MARKERS", "gtkdatabox__markers_8h.html#a08dcfc7c5185ce05e709fb2f8ea65837", null ], + [ "GTK_DATABOX_MARKERS_CLASS", "gtkdatabox__markers_8h.html#a7116a4ccfe62d2d5cc2ffc50293ddaef", null ], + [ "GTK_DATABOX_MARKERS_GET_CLASS", "gtkdatabox__markers_8h.html#a2d50bb9793f2b00411e855e6f284bf54", null ], + [ "GTK_DATABOX_TYPE_MARKERS", "gtkdatabox__markers_8h.html#ae00bb78dc3b13356eb88aaa203e12f66", null ], + [ "GtkDataboxMarkers", "gtkdatabox__markers_8h.html#abf635308204dc2201d03b58c52fc3949", null ], + [ "GtkDataboxMarkersClass", "gtkdatabox__markers_8h.html#a1833aafc64f976d4bf1c3e068afa7d36", null ], + [ "GtkDataboxMarkersPrivate", "gtkdatabox__markers_8h.html#adb96451b78c94cd177c19a3b9327a65f", null ], + [ "GtkDataboxMarkersPosition", "gtkdatabox__markers_8h.html#a00eed26ec0bd9dda1beae02b5aafefe5", null ], + [ "GtkDataboxMarkersTextPosition", "gtkdatabox__markers_8h.html#a4961f123c196f7e3672b1bb75a2e3cf9", null ], + [ "GtkDataboxMarkersType", "gtkdatabox__markers_8h.html#aa69ab5381e7967165c72ddbc681b04e9", null ], + [ "gtk_databox_markers_get_type", "gtkdatabox__markers_8h.html#aa7365a9522c03e53772e103ea29e4559", null ], + [ "gtk_databox_markers_new", "gtkdatabox__markers_8h.html#a2fe335994a64934794b1ee2a3343c293", null ], + [ "gtk_databox_markers_set_label", "gtkdatabox__markers_8h.html#abbeb1af4789491070e93bf07b7eae53f", null ], + [ "gtk_databox_markers_set_position", "gtkdatabox__markers_8h.html#a8c7feba8c2204be9b75dbdaea21d4440", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__dep__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +048341dcb6a7029860f7e3c7bd8b0594 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +4db06f5208a4f18a24c6222b54d1999b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +62244d6731f13046e89ae5112b022478 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +3a15499f8c6b36af081d8674d9dff174 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_a8c7feba8c2204be9b75dbdaea21d4440_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +96f837bb4ce5aafa7c1982825b4063aa \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_cgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +eb882ff0f6bc370d216fded3686a0745 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_abbeb1af4789491070e93bf07b7eae53f_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__markers_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__markers_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,236 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_markers.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_markers.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_markers.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00030 #ifndef __GTK_DATABOX_MARKERS_H__
+00031 #define __GTK_DATABOX_MARKERS_H__
+00032 
+00033 #include <gtkdatabox_xyc_graph.h>
+00034 
+00035 G_BEGIN_DECLS
+00036 #define GTK_DATABOX_TYPE_MARKERS                  (gtk_databox_markers_get_type ())
+00037 #define GTK_DATABOX_MARKERS(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00038                                            GTK_DATABOX_TYPE_MARKERS, \
+00039                                            GtkDataboxMarkers))
+00040 #define GTK_DATABOX_MARKERS_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00041                                            GTK_DATABOX_TYPE_MARKERS, \
+00042                                            GtkDataboxMarkersClass))
+00043 #define GTK_DATABOX_IS_MARKERS(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00044                                            GTK_DATABOX_TYPE_MARKERS))
+00045 #define GTK_DATABOX_IS_MARKERS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00046                                            GTK_DATABOX_TYPE_MARKERS))
+00047 #define GTK_DATABOX_MARKERS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00048                                            GTK_DATABOX_TYPE_MARKERS, \
+00049                                            GtkDataboxMarkersClass))
+00050 
+00059    typedef struct _GtkDataboxMarkers GtkDataboxMarkers;
+00060 
+00061    typedef struct _GtkDataboxMarkersClass GtkDataboxMarkersClass;
+00062 
+00070    typedef struct _GtkDataboxMarkersPrivate GtkDataboxMarkersPrivate;
+00071 
+00082    typedef enum
+00083    {
+00084       GTK_DATABOX_MARKERS_C = 0,
+00085       GTK_DATABOX_MARKERS_N,
+00086       GTK_DATABOX_MARKERS_E,
+00087       GTK_DATABOX_MARKERS_S,
+00088       GTK_DATABOX_MARKERS_W
+00089    }
+00090    GtkDataboxMarkersPosition;
+00091 
+00106    typedef enum
+00107    {
+00108       GTK_DATABOX_MARKERS_TEXT_CENTER = 0,/* text centered   on marker */
+00109       GTK_DATABOX_MARKERS_TEXT_N,         /* text north      of marker */
+00110       GTK_DATABOX_MARKERS_TEXT_NE,        /* text north-east of marker */
+00111       GTK_DATABOX_MARKERS_TEXT_E,         /* text east       of marker */
+00112       GTK_DATABOX_MARKERS_TEXT_SE,        /* text south-east of marker */
+00113       GTK_DATABOX_MARKERS_TEXT_S,         /* text south      of marker */
+00114       GTK_DATABOX_MARKERS_TEXT_SW,        /* text south-west of marker */
+00115       GTK_DATABOX_MARKERS_TEXT_W,         /* text west       of marker */
+00116       GTK_DATABOX_MARKERS_TEXT_NW         /* text north-west of marker */
+00117    }
+00118    GtkDataboxMarkersTextPosition;
+00119 
+00129    typedef enum
+00130    {
+00131       GTK_DATABOX_MARKERS_NONE = 0,     /* No Marker (just text) */
+00132       GTK_DATABOX_MARKERS_TRIANGLE,     /* Marker is a triangle */
+00133       GTK_DATABOX_MARKERS_SOLID_LINE,   /* Marker is a solid line */
+00134       GTK_DATABOX_MARKERS_DASHED_LINE   /* Marker is a dashed line */
+00135    }
+00136    GtkDataboxMarkersType;
+00137 
+00138    struct _GtkDataboxMarkers
+00139    {
+00140       /*< private >*/
+00141       GtkDataboxXYCGraph parent;
+00142 
+00143       GtkDataboxMarkersPrivate *priv;
+00144    };
+00145 
+00146    struct _GtkDataboxMarkersClass
+00147    {
+00148       GtkDataboxXYCGraphClass parent_class;
+00149    };
+00150 
+00151    GType gtk_databox_markers_get_type (void);
+00152 
+00153    GtkDataboxGraph *gtk_databox_markers_new (guint len, gfloat * X, gfloat * Y,
+00154                                             GdkColor * color, guint size,
+00155                                             GtkDataboxMarkersType type);
+00156    void gtk_databox_markers_set_position (GtkDataboxMarkers * markers,
+00157                                          guint index,
+00158                                          GtkDataboxMarkersPosition position);
+00159 
+00160    void gtk_databox_markers_set_label (GtkDataboxMarkers * markers,
+00161                                       guint index,
+00162                                       GtkDataboxMarkersTextPosition label_position,
+00163                                       gchar * text, gboolean boxed);
+00164 
+00165 G_END_DECLS
+00166 #endif                          /* __GTK_DATABOX_MARKERS_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,467 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_marshal.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Defines
+
+
gtk/gtkdatabox_marshal.c File Reference
+
+
+
#include <glib-object.h>
+
+Include dependency graph for gtkdatabox_marshal.c:
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + +

+Defines

#define g_marshal_value_peek_boolean(v)   (v)->data[0].v_int
#define g_marshal_value_peek_char(v)   (v)->data[0].v_int
#define g_marshal_value_peek_uchar(v)   (v)->data[0].v_uint
#define g_marshal_value_peek_int(v)   (v)->data[0].v_int
#define g_marshal_value_peek_uint(v)   (v)->data[0].v_uint
#define g_marshal_value_peek_long(v)   (v)->data[0].v_long
#define g_marshal_value_peek_ulong(v)   (v)->data[0].v_ulong
#define g_marshal_value_peek_int64(v)   (v)->data[0].v_int64
#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
#define g_marshal_value_peek_enum(v)   (v)->data[0].v_long
#define g_marshal_value_peek_flags(v)   (v)->data[0].v_ulong
#define g_marshal_value_peek_float(v)   (v)->data[0].v_float
#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
#define g_marshal_value_peek_param(v)   (v)->data[0].v_pointer
#define g_marshal_value_peek_boxed(v)   (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v)   (v)->data[0].v_pointer
#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+

Define Documentation

+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_boolean( v)   (v)->data[0].v_int
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_boxed( v)   (v)->data[0].v_pointer
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_char( v)   (v)->data[0].v_int
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_double( v)   (v)->data[0].v_double
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_enum( v)   (v)->data[0].v_long
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_flags( v)   (v)->data[0].v_ulong
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_float( v)   (v)->data[0].v_float
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_int( v)   (v)->data[0].v_int
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_int64( v)   (v)->data[0].v_int64
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_long( v)   (v)->data[0].v_long
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_object( v)   (v)->data[0].v_pointer
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_param( v)   (v)->data[0].v_pointer
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_pointer( v)   (v)->data[0].v_pointer
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_string( v)   (v)->data[0].v_pointer
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_uchar( v)   (v)->data[0].v_uint
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_uint( v)   (v)->data[0].v_uint
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_uint64( v)   (v)->data[0].v_uint64
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define g_marshal_value_peek_ulong( v)   (v)->data[0].v_ulong
+
+
+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,21 @@ +var gtkdatabox__marshal_8c = +[ + [ "g_marshal_value_peek_boolean", "gtkdatabox__marshal_8c.html#af3ab7eb9c7691309bdf6046dfcc82d8b", null ], + [ "g_marshal_value_peek_boxed", "gtkdatabox__marshal_8c.html#a26f043474a827c6ac2e98e9fca493298", null ], + [ "g_marshal_value_peek_char", "gtkdatabox__marshal_8c.html#a5460d3217202a613c9a48eda865917d6", null ], + [ "g_marshal_value_peek_double", "gtkdatabox__marshal_8c.html#aea98934d1ddac4d74edc48a7d17a6e0e", null ], + [ "g_marshal_value_peek_enum", "gtkdatabox__marshal_8c.html#a35fe1d602a72c2ad1f5d458bf33ffafb", null ], + [ "g_marshal_value_peek_flags", "gtkdatabox__marshal_8c.html#a578913b201d468b980aa2766857b2eb0", null ], + [ "g_marshal_value_peek_float", "gtkdatabox__marshal_8c.html#a1daab71ef2ff0375e46d62539b7f1f94", null ], + [ "g_marshal_value_peek_int", "gtkdatabox__marshal_8c.html#abbb18568465c7773ea9e81e403fbdb83", null ], + [ "g_marshal_value_peek_int64", "gtkdatabox__marshal_8c.html#ab7114f3df143623b31deef5dc36008d1", null ], + [ "g_marshal_value_peek_long", "gtkdatabox__marshal_8c.html#a1150c77c901dc817f4179092536329d0", null ], + [ "g_marshal_value_peek_object", "gtkdatabox__marshal_8c.html#ace126f5cf973b91f7b4ecd2fa8dc0cab", null ], + [ "g_marshal_value_peek_param", "gtkdatabox__marshal_8c.html#a8003b9bb8e8bd4c4b3f731d34553ddb8", null ], + [ "g_marshal_value_peek_pointer", "gtkdatabox__marshal_8c.html#a4a3ecac677283bb471bdb855b0fd097b", null ], + [ "g_marshal_value_peek_string", "gtkdatabox__marshal_8c.html#a2a21ed70fea4fe7fe9cc26602a63ad79", null ], + [ "g_marshal_value_peek_uchar", "gtkdatabox__marshal_8c.html#ab9cb6275916b0a2a6a519956151a8e5c", null ], + [ "g_marshal_value_peek_uint", "gtkdatabox__marshal_8c.html#a5be924b4195e95f7cd356769fe7f2f4c", null ], + [ "g_marshal_value_peek_uint64", "gtkdatabox__marshal_8c.html#a3cd5b18a1e20cc196b804fd6d7163f0a", null ], + [ "g_marshal_value_peek_ulong", "gtkdatabox__marshal_8c.html#af0ae440289733646b8a24a7d6e252523", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,2 @@ + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +d62eaca0d2f4ed9f1b560099bcc65518 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,180 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_marshal.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Defines
+
+
gtk/gtkdatabox_marshal.h File Reference
+
+
+
#include <glib-object.h>
+
+Include dependency graph for gtkdatabox_marshal.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + +

+Defines

#define gtk_databox_marshal_VOID__VOID   g_cclosure_marshal_VOID__VOID
#define gtk_databox_marshal_VOID__POINTER   g_cclosure_marshal_VOID__POINTER
+

Define Documentation

+ +
+
+ + + + +
#define gtk_databox_marshal_VOID__POINTER   g_cclosure_marshal_VOID__POINTER
+
+
+ +
+
+ +
+
+ + + + +
#define gtk_databox_marshal_VOID__VOID   g_cclosure_marshal_VOID__VOID
+
+
+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var gtkdatabox__marshal_8h = +[ + [ "gtk_databox_marshal_VOID__POINTER", "gtkdatabox__marshal_8h.html#ac75e8dafbaa0314f81fadc6f9686d4d7", null ], + [ "gtk_databox_marshal_VOID__VOID", "gtkdatabox__marshal_8h.html#aed6a3c4f59fdbc35dd639150602e4583", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__dep__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +073f081ff2a0f1065c20047daedb9dd6 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,2 @@ + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +cd223c701c9400cc6fea585201c23d99 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__marshal_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__marshal_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,142 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_marshal.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_marshal.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_marshal.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 
+00003 #ifndef __gtk_databox_marshal_MARSHAL_H__
+00004 #define __gtk_databox_marshal_MARSHAL_H__
+00005 
+00006 #include        <glib-object.h>
+00007 
+00008 G_BEGIN_DECLS
+00009 /* VOID:VOID (gtkdatabox_marshal.list:1) */
+00010 #define gtk_databox_marshal_VOID__VOID  g_cclosure_marshal_VOID__VOID
+00011 /* VOID:POINTER (gtkdatabox_marshal.list:2) */
+00012 #define gtk_databox_marshal_VOID__POINTER       g_cclosure_marshal_VOID__POINTER
+00013    G_END_DECLS
+00014 #endif /* __gtk_databox_marshal_MARSHAL_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,220 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_offset_bars.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Functions
+
+
gtk/gtkdatabox_offset_bars.c File Reference
+
+
+
#include <gtkdatabox_offset_bars.h>
+
+Include dependency graph for gtkdatabox_offset_bars.c:
+
+
+ + +
+
+ + + + + +

+Data Structures

struct  _GtkDataboxOffsetBarsPrivate

+Functions

GType gtk_databox_offset_bars_get_type (void)
GtkDataboxGraph * gtk_databox_offset_bars_new (guint len, gfloat *X, gfloat *Y1, gfloat *Y2, GdkColor *color, guint size)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_offset_bars_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_offset_bars_new (guint len,
gfloat * X,
gfloat * Y1,
gfloat * Y2,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_offset_bars_new: : length of , and : array of horizontal position values of markers : array of starting vertical position values of markers : array of ending vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxOffsetBars object which can be added to a GtkDatabox widget

+

Return value: A new GtkDataboxOffsetBars object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,11 @@ +var gtkdatabox__offset__bars_8c = +[ + [ "bars_finalize", "gtkdatabox__offset__bars_8c.html#ac9e61781f0117e39fdaee54c26bb7073", null ], + [ "gtk_databox_offset_bars_class_init", "gtkdatabox__offset__bars_8c.html#acf2c14b7d834239f5525a7caefb77644", null ], + [ "gtk_databox_offset_bars_complete", "gtkdatabox__offset__bars_8c.html#aa43c3f730eec8267c56a5e03e4cfdafe", null ], + [ "gtk_databox_offset_bars_get_type", "gtkdatabox__offset__bars_8c.html#adf4bbb42b44f6400d82d643f70f90b1b", null ], + [ "gtk_databox_offset_bars_instance_init", "gtkdatabox__offset__bars_8c.html#afdad3769242c93f113f453655ac66ee3", null ], + [ "gtk_databox_offset_bars_new", "gtkdatabox__offset__bars_8c.html#ae30e202f34fb310a4ea4d650f5302468", null ], + [ "gtk_databox_offset_bars_real_draw", "gtkdatabox__offset__bars_8c.html#af21db68e4f56994fcbc4d4d44d400bb2", null ], + [ "parent_class", "gtkdatabox__offset__bars_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +fbee763c3df7c64ed61d18911864cec6 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,407 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_offset_bars.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_offset_bars.h File Reference
+
+
+
#include <gtkdatabox_xyyc_graph.h>
+
+Include dependency graph for gtkdatabox_offset_bars.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxOffsetBars
struct  _GtkDataboxOffsetBarsClass

+Defines

#define GTK_DATABOX_TYPE_OFFSET_BARS   (gtk_databox_offset_bars_get_type ())
#define GTK_DATABOX_OFFSET_BARS(obj)
#define GTK_DATABOX_OFFSET_BARS_CLASS(klass)
#define GTK_DATABOX_IS_OFFSET_BARS(obj)
#define GTK_DATABOX_IS_OFFSET_BARS_CLASS(klass)
#define GTK_DATABOX_OFFSET_BARS_GET_CLASS(obj)

+Typedefs

typedef struct
+_GtkDataboxOffsetBars 		GtkDataboxOffsetBars
typedef struct
+_GtkDataboxOffsetBarsClass 		GtkDataboxOffsetBarsClass
typedef struct
+_GtkDataboxOffsetBarsPrivate 		GtkDataboxOffsetBarsPrivate

+Functions

GType gtk_databox_offset_bars_get_type (void)
GtkDataboxGraph * gtk_databox_offset_bars_new (guint len, gfloat *X, gfloat *Y1, gfloat *Y2, GdkColor *color, guint size)
+

Detailed Description

+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_OFFSET_BARS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_OFFSET_BARS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_OFFSET_BARS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_OFFSET_BARS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_OFFSET_BARS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_OFFSET_BARS, \
+                                           GtkDataboxOffsetBars))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_OFFSET_BARS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_OFFSET_BARS, \
+                                           GtkDataboxOffsetBarsClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_OFFSET_BARS_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_OFFSET_BARS, \
+                                           GtkDataboxOffsetBarsClass))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_OFFSET_BARS   (gtk_databox_offset_bars_get_type ())
+
+
+

SECTION:gtkdatabox_offset_bars : A GtkDataboxGraph used for displaying xyy-values (x, y1 and y2 values) as vertical bars from y1 to y2. gtkdatabox_offset_bars.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxOffsetBars

+

GtkDataboxOffsetBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y1 to y2.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxOffsetBars GtkDataboxOffsetBars
+
+
+

GtkDataboxOffsetBars: : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxBars

+

GtkDataboxOffsetBars is a GtkDataboxGraph class for displaying xyy-values as vertical bars which rise/drop from y1.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxOffsetBarsClass GtkDataboxOffsetBarsClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxOffsetBarsPrivate GtkDataboxOffsetBarsPrivate
+
+
+

GtkDataboxOffsetBarsPrivate

+

A private data structure used by the GtkDataboxOffsetBars. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_offset_bars_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_offset_bars_new (guint len,
gfloat * X,
gfloat * Y1,
gfloat * Y2,
GdkColor * color,
guint size 
)
+
+
+

gtk_databox_offset_bars_new: : length of , and : array of horizontal position values of markers : array of starting vertical position values of markers : array of ending vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxOffsetBars object which can be added to a GtkDatabox widget

+

Return value: A new GtkDataboxOffsetBars object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var gtkdatabox__offset__bars_8h = +[ + [ "GTK_DATABOX_IS_OFFSET_BARS", "gtkdatabox__offset__bars_8h.html#aa4d668f9df20947343d663280d352110", null ], + [ "GTK_DATABOX_IS_OFFSET_BARS_CLASS", "gtkdatabox__offset__bars_8h.html#a90da1cbd8b939a857325bdd212c990c7", null ], + [ "GTK_DATABOX_OFFSET_BARS", "gtkdatabox__offset__bars_8h.html#af0061192f6046a5f620e2a3725ad8c99", null ], + [ "GTK_DATABOX_OFFSET_BARS_CLASS", "gtkdatabox__offset__bars_8h.html#a1b4a9589798c197ab0598ba57c79a113", null ], + [ "GTK_DATABOX_OFFSET_BARS_GET_CLASS", "gtkdatabox__offset__bars_8h.html#a04e5257482ee2ef7e189bd830b3ca6d3", null ], + [ "GTK_DATABOX_TYPE_OFFSET_BARS", "gtkdatabox__offset__bars_8h.html#a0b9f6888ad28a3703fa126715075e2cd", null ], + [ "GtkDataboxOffsetBars", "gtkdatabox__offset__bars_8h.html#abe5b5365cbbc158342540b3a61781741", null ], + [ "GtkDataboxOffsetBarsClass", "gtkdatabox__offset__bars_8h.html#aaad9d83348ee59eb9f2b27249cb82192", null ], + [ "GtkDataboxOffsetBarsPrivate", "gtkdatabox__offset__bars_8h.html#a2193f59735be77271922c8cb9365fc30", null ], + [ "gtk_databox_offset_bars_get_type", "gtkdatabox__offset__bars_8h.html#adf4bbb42b44f6400d82d643f70f90b1b", null ], + [ "gtk_databox_offset_bars_new", "gtkdatabox__offset__bars_8h.html#ae30e202f34fb310a4ea4d650f5302468", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__dep__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +2aaab4f6b7ce731010fdf6b85f7edccb \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +0a3b6ee84c3904c360c90aa86f7fdf32 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__offset__bars_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__offset__bars_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,193 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_offset_bars.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_offset_bars.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_offset_bars.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  *
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  *
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00030 #ifndef __GTK_DATABOX_OFFSET_BARS_H__
+00031 #define __GTK_DATABOX_OFFSET_BARS_H__
+00032 
+00033 #include <gtkdatabox_xyyc_graph.h>
+00034 
+00035 G_BEGIN_DECLS
+00036 #define GTK_DATABOX_TYPE_OFFSET_BARS              (gtk_databox_offset_bars_get_type ())
+00037 #define GTK_DATABOX_OFFSET_BARS(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00038                                            GTK_DATABOX_TYPE_OFFSET_BARS, \
+00039                                            GtkDataboxOffsetBars))
+00040 #define GTK_DATABOX_OFFSET_BARS_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00041                                            GTK_DATABOX_TYPE_OFFSET_BARS, \
+00042                                            GtkDataboxOffsetBarsClass))
+00043 #define GTK_DATABOX_IS_OFFSET_BARS(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00044                                            GTK_DATABOX_TYPE_OFFSET_BARS))
+00045 #define GTK_DATABOX_IS_OFFSET_BARS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00046                                            GTK_DATABOX_TYPE_OFFSET_BARS))
+00047 #define GTK_DATABOX_OFFSET_BARS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00048                                            GTK_DATABOX_TYPE_OFFSET_BARS, \
+00049                                            GtkDataboxOffsetBarsClass))
+00050 
+00058    typedef struct _GtkDataboxOffsetBars GtkDataboxOffsetBars;
+00059 
+00060    typedef struct _GtkDataboxOffsetBarsClass GtkDataboxOffsetBarsClass;
+00061 
+00069    typedef struct _GtkDataboxOffsetBarsPrivate GtkDataboxOffsetBarsPrivate;
+00070 
+00071    struct _GtkDataboxOffsetBars
+00072    {
+00073       /*< private >*/
+00074       GtkDataboxXYYCGraph parent;
+00075 
+00076       GtkDataboxOffsetBarsPrivate *priv;
+00077    };
+00078 
+00079    struct _GtkDataboxOffsetBarsClass
+00080    {
+00081       GtkDataboxXYYCGraphClass parent_class;
+00082    };
+00083 
+00084    GType gtk_databox_offset_bars_get_type (void);
+00085 
+00086    GtkDataboxGraph *gtk_databox_offset_bars_new (guint len, gfloat * X, gfloat * Y1, gfloat * Y2,
+00087                                           GdkColor * color, guint size);
+00088 
+00089 G_END_DECLS
+00090 #endif                          /* __GTK_DATABOX_OFFSET_BARS_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,214 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_points.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Functions
+
+
gtk/gtkdatabox_points.c File Reference
+
+
+
#include <gtkdatabox_points.h>
+
+Include dependency graph for gtkdatabox_points.c:
+
+
+ + +
+
+ + + + + +

+Data Structures

struct  _GtkDataboxPointsPrivate

+Functions

GType gtk_databox_points_get_type (void)
GtkDataboxGraph * gtk_databox_points_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, gint size)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_points_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_points_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
gint size 
)
+
+
+

gtk_databox_points_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxPoints object which can be added to a GtkDatabox widget.

+

Return value: A new GtkDataboxPoints object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,11 @@ +var gtkdatabox__points_8c = +[ + [ "gtk_databox_points_class_init", "gtkdatabox__points_8c.html#a3bb20fc10546dd030196c2497797ca9e", null ], + [ "gtk_databox_points_complete", "gtkdatabox__points_8c.html#a2db7498080e614f0148e47f4743d072f", null ], + [ "gtk_databox_points_get_type", "gtkdatabox__points_8c.html#abd2cd606d7d3bc86842dc92a43c57ab9", null ], + [ "gtk_databox_points_instance_init", "gtkdatabox__points_8c.html#a77a9336da912dbaa7319a90e64e726cc", null ], + [ "gtk_databox_points_new", "gtkdatabox__points_8c.html#af0dfaed009ffd41dc9a43814d6d748c8", null ], + [ "gtk_databox_points_real_draw", "gtkdatabox__points_8c.html#a6e8afd8c11cd95d970f4342ca07ed970", null ], + [ "points_finalize", "gtkdatabox__points_8c.html#ac166de35a0b384fd52970526f31d6291", null ], + [ "parent_class", "gtkdatabox__points_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +ca24b2f1268cef582d7b5172505bc55a \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,399 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_points.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_points.h File Reference
+
+
+
#include <gtkdatabox_xyc_graph.h>
+
+Include dependency graph for gtkdatabox_points.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxPoints
struct  _GtkDataboxPointsClass

+Defines

#define GTK_DATABOX_TYPE_POINTS   (gtk_databox_points_get_type ())
#define GTK_DATABOX_POINTS(obj)
#define GTK_DATABOX_POINTS_CLASS(klass)
#define GTK_DATABOX_IS_POINTS(obj)
#define GTK_DATABOX_IS_POINTS_CLASS(klass)
#define GTK_DATABOX_POINTS_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxPoints GtkDataboxPoints
typedef struct
+_GtkDataboxPointsClass 		GtkDataboxPointsClass
typedef struct
+_GtkDataboxPointsPrivate 		GtkDataboxPointsPrivate

+Functions

GType gtk_databox_points_get_type (void)
GtkDataboxGraph * gtk_databox_points_new (guint len, gfloat *X, gfloat *Y, GdkColor *color, gint size)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_POINTS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_POINTS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_POINTS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_POINTS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_POINTS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_POINTS, \
+                                           GtkDataboxPoints))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_POINTS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_POINTS, \
+                                           GtkDataboxPointsClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_POINTS_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_POINTS, \
+                                           GtkDataboxPointsClass))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_POINTS   (gtk_databox_points_get_type ())
+
+
+

SECTION:gtkdatabox_points : A GtkDataboxGraph used for displaying xy-values as dots. gtkdatabox_points.h : GtkDatabox, GtkDataboxGraph, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers

+

GtkDataboxPoints is a GtkDataboxGraph class for displaying xy-values as dots.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxPoints GtkDataboxPoints
+
+
+

GtkDataboxPoints: : GtkDatabox, GtkDataboxGraph, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers

+

GtkDataboxPoints is a GtkDataboxGraph class for displaying xy-values as dots.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxPointsClass GtkDataboxPointsClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxPointsPrivate GtkDataboxPointsPrivate
+
+
+

GtkDataboxPointsPrivate

+

A private data structure used by the GtkDataboxPoints. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_points_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_points_new (guint len,
gfloat * X,
gfloat * Y,
GdkColor * color,
gint size 
)
+
+
+

gtk_databox_points_new: : length of and : array of horizontal position values of markers : array of vertical position values of markers : color of the markers : marker size or line width (depending on the )

+

Creates a new GtkDataboxPoints object which can be added to a GtkDatabox widget.

+

Return value: A new GtkDataboxPoints object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var gtkdatabox__points_8h = +[ + [ "GTK_DATABOX_IS_POINTS", "gtkdatabox__points_8h.html#a0e4223164a914c416dcaa6b2ce122d58", null ], + [ "GTK_DATABOX_IS_POINTS_CLASS", "gtkdatabox__points_8h.html#a03b5191ade5ddb6bef466765608aeb07", null ], + [ "GTK_DATABOX_POINTS", "gtkdatabox__points_8h.html#ac711fd98a53cdb4d297b9d921a7aa6f2", null ], + [ "GTK_DATABOX_POINTS_CLASS", "gtkdatabox__points_8h.html#a4ffc1ff9b9efe75a1f22576dd0d3eae6", null ], + [ "GTK_DATABOX_POINTS_GET_CLASS", "gtkdatabox__points_8h.html#a4f77717efce28f9f32bcb65886597384", null ], + [ "GTK_DATABOX_TYPE_POINTS", "gtkdatabox__points_8h.html#ad92fc67eeb26596ad209d729307a2028", null ], + [ "GtkDataboxPoints", "gtkdatabox__points_8h.html#abaa12aadf966baa4eff15014c3cbe3e5", null ], + [ "GtkDataboxPointsClass", "gtkdatabox__points_8h.html#a439f552dea22cc339086d3367a10cedd", null ], + [ "GtkDataboxPointsPrivate", "gtkdatabox__points_8h.html#a099d4368c714fa2fd8a778caddecd5e8", null ], + [ "gtk_databox_points_get_type", "gtkdatabox__points_8h.html#abd2cd606d7d3bc86842dc92a43c57ab9", null ], + [ "gtk_databox_points_new", "gtkdatabox__points_8h.html#af0dfaed009ffd41dc9a43814d6d748c8", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__dep__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +3d0cc401f366ecdfcacc4774ff0cba5e \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +cb0e7dee931b3f1b63bda357abc2dc0a \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__points_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__points_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,194 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_points.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_points.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_points.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00030 #ifndef __GTK_DATABOX_POINTS_H__
+00031 #define __GTK_DATABOX_POINTS_H__
+00032 
+00033 #include <gtkdatabox_xyc_graph.h>
+00034 
+00035 G_BEGIN_DECLS
+00036 #define GTK_DATABOX_TYPE_POINTS           (gtk_databox_points_get_type ())
+00037 #define GTK_DATABOX_POINTS(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00038                                            GTK_DATABOX_TYPE_POINTS, \
+00039                                            GtkDataboxPoints))
+00040 #define GTK_DATABOX_POINTS_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00041                                            GTK_DATABOX_TYPE_POINTS, \
+00042                                            GtkDataboxPointsClass))
+00043 #define GTK_DATABOX_IS_POINTS(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00044                                            GTK_DATABOX_TYPE_POINTS))
+00045 #define GTK_DATABOX_IS_POINTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00046                                            GTK_DATABOX_TYPE_POINTS))
+00047 #define GTK_DATABOX_POINTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00048                                            GTK_DATABOX_TYPE_POINTS, \
+00049                                            GtkDataboxPointsClass))
+00050 
+00059    typedef struct _GtkDataboxPoints GtkDataboxPoints;
+00060 
+00061    typedef struct _GtkDataboxPointsClass GtkDataboxPointsClass;
+00062 
+00070    typedef struct _GtkDataboxPointsPrivate GtkDataboxPointsPrivate;
+00071 
+00072    struct _GtkDataboxPoints
+00073    {
+00074       /*< private >*/
+00075       GtkDataboxXYCGraph parent;
+00076 
+00077       GtkDataboxPointsPrivate *priv;
+00078    };
+00079 
+00080    struct _GtkDataboxPointsClass
+00081    {
+00082       GtkDataboxXYCGraphClass parent_class;
+00083    };
+00084 
+00085    GType gtk_databox_points_get_type (void);
+00086 
+00087    GtkDataboxGraph *gtk_databox_points_new (guint len, gfloat * X, gfloat * Y,
+00088                                             GdkColor * color, gint size);
+00089 
+00090 G_END_DECLS
+00091 #endif                          /* __GTK_DATABOX_POINTS_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,214 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_regions.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Functions
+
+
gtk/gtkdatabox_regions.c File Reference
+
+
+
#include <gtkdatabox_regions.h>
+
+Include dependency graph for gtkdatabox_regions.c:
+
+
+ + +
+
+ + + + + +

+Data Structures

struct  _GtkDataboxRegionsPrivate

+Functions

GType gtk_databox_regions_get_type (void)
GtkDataboxGraph * gtk_databox_regions_new (guint len, gfloat *X, gfloat *Y1, gfloat *Y2, GdkColor *color)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_regions_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_regions_new (guint len,
gfloat * X,
gfloat * Y1,
gfloat * Y2,
GdkColor * color 
)
+
+
+

gtk_databox_regions_new: : length of , and : array of ordinates : array of co-ordinates : array of co-ordinates : color of the markers

+

Creates a new GtkDataboxRegions object which can be added to a GtkDatabox widget

+

Return value: A new GtkDataboxRegions object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,11 @@ +var gtkdatabox__regions_8c = +[ + [ "gtk_databox_regions_class_init", "gtkdatabox__regions_8c.html#a89348d6f07cc09f279582a51085f6ca0", null ], + [ "gtk_databox_regions_complete", "gtkdatabox__regions_8c.html#ac84a08eb0dada7309065b8b215dfa559", null ], + [ "gtk_databox_regions_get_type", "gtkdatabox__regions_8c.html#af7937888b88f89c9fda743367f25965a", null ], + [ "gtk_databox_regions_instance_init", "gtkdatabox__regions_8c.html#a6a30f3f8f58c57d4d034306a5b2987cb", null ], + [ "gtk_databox_regions_new", "gtkdatabox__regions_8c.html#a831a515856650fb953f4b1e836eb8d38", null ], + [ "gtk_databox_regions_real_draw", "gtkdatabox__regions_8c.html#a07d3558fc9c074321c95bdd85066cb89", null ], + [ "regions_finalize", "gtkdatabox__regions_8c.html#a8c70eaabdaa4e89e957da7e18816eb77", null ], + [ "parent_class", "gtkdatabox__regions_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +2a82b9d7051b513c6d98487cdbce51d5 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,399 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_regions.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_regions.h File Reference
+
+
+
#include <gtkdatabox_xyyc_graph.h>
+
+Include dependency graph for gtkdatabox_regions.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxRegions
struct  _GtkDataboxRegionsClass

+Defines

#define GTK_DATABOX_TYPE_REGIONS   (gtk_databox_regions_get_type ())
#define GTK_DATABOX_REGIONS(obj)
#define GTK_DATABOX_REGIONS_CLASS(klass)
#define GTK_DATABOX_IS_REGIONS(obj)
#define GTK_DATABOX_IS_REGIONS_CLASS(klass)
#define GTK_DATABOX_REGIONS_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxRegions GtkDataboxRegions
typedef struct
+_GtkDataboxRegionsClass 		GtkDataboxRegionsClass
typedef struct
+_GtkDataboxRegionsPrivate 		GtkDataboxRegionsPrivate

+Functions

GType gtk_databox_regions_get_type (void)
GtkDataboxGraph * gtk_databox_regions_new (guint len, gfloat *X, gfloat *Y1, gfloat *Y2, GdkColor *color)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_REGIONS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_REGIONS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_REGIONS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_REGIONS))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_REGIONS( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_REGIONS, \
+                                           GtkDataboxRegions))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_REGIONS_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_REGIONS, \
+                                           GtkDataboxRegionsClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_REGIONS_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_REGIONS, \
+                                           GtkDataboxRegionsClass))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_REGIONS   (gtk_databox_regions_get_type ())
+
+
+

SECTION:gtkdatabox_regions : A GtkDataboxGraph used for displaying xxyy-values (x1, x2, y1 and y2 values) as oblongs from x1 to y1, x2 to y2. gtkdatabox_regions.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxRegions

+

GtkDataboxRegions is a GtkDataboxGraph class for displaying xxyy-values as oblongs.

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxRegions GtkDataboxRegions
+
+
+

GtkDataboxRegions: : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxBars, GtkDataboxOffsetBars

+

GtkDataboxRegions is a GtkDataboxGraph class for displaying xxyy-values as oblongs.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxRegionsClass GtkDataboxRegionsClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxRegionsPrivate GtkDataboxRegionsPrivate
+
+
+

GtkDataboxRegionsPrivate

+

A private data structure used by the GtkDataboxRegions. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_regions_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GtkDataboxGraph* gtk_databox_regions_new (guint len,
gfloat * X,
gfloat * Y1,
gfloat * Y2,
GdkColor * color 
)
+
+
+

gtk_databox_regions_new: : length of , and : array of ordinates : array of co-ordinates : array of co-ordinates : color of the markers

+

Creates a new GtkDataboxRegions object which can be added to a GtkDatabox widget

+

Return value: A new GtkDataboxRegions object

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,14 @@ +var gtkdatabox__regions_8h = +[ + [ "GTK_DATABOX_IS_REGIONS", "gtkdatabox__regions_8h.html#a4cedf5b24b01efa233724ff63cb0e12b", null ], + [ "GTK_DATABOX_IS_REGIONS_CLASS", "gtkdatabox__regions_8h.html#a61f0e7bfe3b6940971d307b561bee8d0", null ], + [ "GTK_DATABOX_REGIONS", "gtkdatabox__regions_8h.html#a14e4809676549189e46d0c1743322719", null ], + [ "GTK_DATABOX_REGIONS_CLASS", "gtkdatabox__regions_8h.html#a95887267b3477b8aaac7d49b6cadf2e9", null ], + [ "GTK_DATABOX_REGIONS_GET_CLASS", "gtkdatabox__regions_8h.html#a16721b18eb692c7d516cdc0155249863", null ], + [ "GTK_DATABOX_TYPE_REGIONS", "gtkdatabox__regions_8h.html#a04e8902a67b0e5c1ed7b96ffe2603690", null ], + [ "GtkDataboxRegions", "gtkdatabox__regions_8h.html#a5240f5e117361f158d2e6d0774d6dcb9", null ], + [ "GtkDataboxRegionsClass", "gtkdatabox__regions_8h.html#aead6c38380037bd2b6cb0a727289fa92", null ], + [ "GtkDataboxRegionsPrivate", "gtkdatabox__regions_8h.html#a1960a39191f57fef3839651137d8ae88", null ], + [ "gtk_databox_regions_get_type", "gtkdatabox__regions_8h.html#af7937888b88f89c9fda743367f25965a", null ], + [ "gtk_databox_regions_new", "gtkdatabox__regions_8h.html#a831a515856650fb953f4b1e836eb8d38", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__dep__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__dep__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +c459f66ddc8ac125c242b38fccd46cb4 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +43eaf00495802fb7760b330cdf8de2ac \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__regions_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__regions_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,193 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_regions.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_regions.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_regions.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  *
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  *
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00030 #ifndef __GTK_DATABOX_REGIONS_H__
+00031 #define __GTK_DATABOX_REGIONS_H__
+00032 
+00033 #include <gtkdatabox_xyyc_graph.h>
+00034 
+00035 G_BEGIN_DECLS
+00036 #define GTK_DATABOX_TYPE_REGIONS                  (gtk_databox_regions_get_type ())
+00037 #define GTK_DATABOX_REGIONS(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00038                                            GTK_DATABOX_TYPE_REGIONS, \
+00039                                            GtkDataboxRegions))
+00040 #define GTK_DATABOX_REGIONS_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00041                                            GTK_DATABOX_TYPE_REGIONS, \
+00042                                            GtkDataboxRegionsClass))
+00043 #define GTK_DATABOX_IS_REGIONS(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00044                                            GTK_DATABOX_TYPE_REGIONS))
+00045 #define GTK_DATABOX_IS_REGIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00046                                            GTK_DATABOX_TYPE_REGIONS))
+00047 #define GTK_DATABOX_REGIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00048                                            GTK_DATABOX_TYPE_REGIONS, \
+00049                                            GtkDataboxRegionsClass))
+00050 
+00058    typedef struct _GtkDataboxRegions GtkDataboxRegions;
+00059 
+00060    typedef struct _GtkDataboxRegionsClass GtkDataboxRegionsClass;
+00061 
+00069    typedef struct _GtkDataboxRegionsPrivate GtkDataboxRegionsPrivate;
+00070 
+00071    struct _GtkDataboxRegions
+00072    {
+00073       /*< private >*/
+00074       GtkDataboxXYYCGraph parent;
+00075 
+00076       GtkDataboxRegionsPrivate *priv;
+00077    };
+00078 
+00079    struct _GtkDataboxRegionsClass
+00080    {
+00081       GtkDataboxXYYCGraphClass parent_class;
+00082    };
+00083 
+00084    GType gtk_databox_regions_get_type (void);
+00085 
+00086    GtkDataboxGraph *gtk_databox_regions_new (guint len, gfloat * X, gfloat * Y1, gfloat * Y2, GdkColor * color);
+00087 
+00088 G_END_DECLS
+00089 #endif                          /* __GTK_DATABOX_REGIONS_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,1290 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_ruler.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Enumerations | +Functions
+
+
gtk/gtkdatabox_ruler.c File Reference
+
+
+
#include <gtkdatabox_ruler.h>
+#include <math.h>
+#include <glib/gprintf.h>
+#include <string.h>
+
+Include dependency graph for gtkdatabox_ruler.c:
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxRulerPrivate

+Defines

#define RULER_SIZE   14
#define ROUND(x)   ((int) ((x) + 0.5))
#define FORMAT_LENGTH   20 /* the length of the label format string */
#define LINEAR_FORMAT_MARKUP   "%%-+%dg"
#define LOG_FORMAT_MARKUP   "%%-%dg"
#define __GTK_DATABOX_RULER_C__

+Enumerations

enum  {
+  PROP_0, +PROP_LOWER, +PROP_UPPER, +PROP_POSITION, +
+  PROP_DRAW_POSITION, +PROP_MAX_LENGTH, +PROP_ORIENTATION, +PROP_TEXT_ORIENTATION, +
+  PROP_TEXT_ALIGNMENT, +PROP_TEXT_HOFFSET, +PROP_DRAW_TICKS, +PROP_DRAW_SUBTICKS, +
+  PROP_MANUAL_TICKS, +PROP_MANUAL_TICK_CNT, +PROP_MANUAL_TICK_LABELS, +PROP_INVERT_EDGE, +
+  PROP_LINEAR_LABEL_FORMAT, +PROP_LOG_LABEL_FORMAT, +PROP_BOX_SHADOW, +PROP_END_OF_LIST +
+ }

+Functions

GtkWidget * gtk_databox_ruler_new (GtkOrientation orientation)
void gtk_databox_ruler_set_range (GtkDataboxRuler *ruler, gdouble lower, gdouble upper, gdouble position)
void gtk_databox_ruler_set_max_length (GtkDataboxRuler *ruler, guint max_length)
void gtk_databox_ruler_set_scale_type (GtkDataboxRuler *ruler, GtkDataboxScaleType scale_type)
void gtk_databox_ruler_set_orientation (GtkDataboxRuler *ruler, GtkOrientation orientation)
GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_text_orientation (GtkDataboxRuler *ruler, GtkOrientation orientation)
GtkOrientation gtk_databox_ruler_get_text_orientation (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_text_alignment (GtkDataboxRuler *ruler, PangoAlignment alignment)
PangoAlignment gtk_databox_ruler_get_text_alignment (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler *ruler, gint offset)
gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_draw_position (GtkDataboxRuler *ruler, gboolean draw)
gboolean gtk_databox_ruler_get_draw_position (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_draw_ticks (GtkDataboxRuler *ruler, gboolean draw)
gboolean gtk_databox_ruler_get_draw_ticks (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_draw_subticks (GtkDataboxRuler *ruler, gboolean draw)
gboolean gtk_databox_ruler_get_draw_subticks (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_manual_ticks (GtkDataboxRuler *ruler, gfloat *manual_ticks)
gfloat * gtk_databox_ruler_get_manual_ticks (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_manual_tick_cnt (GtkDataboxRuler *ruler, guint manual_tick_cnt)
guint gtk_databox_ruler_get_manual_tick_cnt (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_manual_tick_labels (GtkDataboxRuler *ruler, gchar **manual_tick_labels)
gchar ** gtk_databox_ruler_get_manual_tick_labels (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_invert_edge (GtkDataboxRuler *ruler, gboolean invert)
gboolean gtk_databox_ruler_get_invert_edge (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_linear_label_format (GtkDataboxRuler *ruler, gchar *format)
gchar * gtk_databox_ruler_get_linear_label_format (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_log_label_format (GtkDataboxRuler *ruler, gchar *format)
gchar * gtk_databox_ruler_get_log_label_format (GtkDataboxRuler *ruler)
void gtk_databox_ruler_get_range (GtkDataboxRuler *ruler, gdouble *lower, gdouble *upper, gdouble *position)
guint gtk_databox_ruler_get_max_length (GtkDataboxRuler *ruler)
GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_box_shadow (GtkDataboxRuler *ruler, GtkShadowType which_shadow)
GtkShadowType gtk_databox_ruler_get_box_shadow (GtkDataboxRuler *ruler)
+

Define Documentation

+ +
+
+ + + + +
#define __GTK_DATABOX_RULER_C__
+
+
+ +
+
+ +
+
+ + + + +
#define FORMAT_LENGTH   20 /* the length of the label format string */
+
+
+ +
+
+ +
+
+ + + + +
#define LINEAR_FORMAT_MARKUP   "%%-+%dg"
+
+
+ +
+
+ +
+
+ + + + +
#define LOG_FORMAT_MARKUP   "%%-%dg"
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define ROUND( x)   ((int) ((x) + 0.5))
+
+
+ +
+
+ +
+
+ + + + +
#define RULER_SIZE   14
+
+
+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + + + + + + + + + + + + + + + + + + +
PROP_0  +
PROP_LOWER  +
PROP_UPPER  +
PROP_POSITION  +
PROP_DRAW_POSITION  +
PROP_MAX_LENGTH  +
PROP_ORIENTATION  +
PROP_TEXT_ORIENTATION  +
PROP_TEXT_ALIGNMENT  +
PROP_TEXT_HOFFSET  +
PROP_DRAW_TICKS  +
PROP_DRAW_SUBTICKS  +
PROP_MANUAL_TICKS  +
PROP_MANUAL_TICK_CNT  +
PROP_MANUAL_TICK_LABELS  +
PROP_INVERT_EDGE  +
PROP_LINEAR_LABEL_FORMAT  +
PROP_LOG_LABEL_FORMAT  +
PROP_BOX_SHADOW  +
PROP_END_OF_LIST  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GtkShadowType gtk_databox_ruler_get_box_shadow (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_box_shadow: : a GtkDataboxRuler

+

Gets the type of shadow being rendered to the (GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT).

+

Return value: The currently used shadow type of the , -1 on failure.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_draw_position (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_draw_position: : a GtkDataboxRuler

+

Gets the draw position arrows option from the (horizontal or vertical).

+

Return value: Position drawing option of the .

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_draw_subticks (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_draw_subticks: : a GtkDataboxRuler

+

Gets the draw subticks option from the (horizontal or vertical).

+

Return value: Subtick drawing option of the .

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_draw_ticks (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_draw_ticks: : a GtkDataboxRuler

+

Gets the draw ticks option from the (horizontal or vertical).

+

Return value: Tick drawing option of the .

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_invert_edge (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_invert_edge: : a GtkDataboxRuler

+

Gets the invert edge option from the (horizontal or vertical).

+

Return value: Edge inversion option of the .

+ +
+
+ +
+
+ + + + + + + + +
gchar* gtk_databox_ruler_get_linear_label_format (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_linear_label_format: : a GtkDataboxRuler

+

Gets the linear label meta format of the (horizontal or vertical).

+

Return value: The string meta format the NULL on failure.

+ +
+
+ +
+
+ + + + + + + + +
gchar* gtk_databox_ruler_get_log_label_format (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_log_label_format: : a GtkDataboxRuler

+

Gets the log label meta format of the (horizontal or vertical).

+

Return value: The string meta format the , NULL on failure.

+ +
+
+ +
+
+ + + + + + + + +
guint gtk_databox_ruler_get_manual_tick_cnt (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_grid_get_manual_tick_cnt: : a GtkDataboxRuler

+

Gets the number manual tick values for the .

+

Return value: The number of manual tick values for the .

+ +
+
+ +
+
+ + + + + + + + +
gchar** gtk_databox_ruler_get_manual_tick_labels (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_grid_get_manual_tick_labels: : a GtkDataboxRuler

+

Gets the pointer to the manual tick labels for the .

+

Return value: Pointer to the manual tick labels for the .

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_ruler_get_manual_ticks (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_grid_get_manual_ticks: : a GtkDataboxRuler

+

Gets the pointer to the manual tick values for the .

+

Return value: Pointer to the manual tick values for the .

+ +
+
+ +
+
+ + + + + + + + +
guint gtk_databox_ruler_get_max_length (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_max_length: : A GtkDataboxRuler widget

+

This function returns the maximum number of digits to be used for each tick label of the .

+

Return value: The maximum length of the tick labels.

+ +
+
+ +
+
+ + + + + + + + +
GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_orientation: : a GtkDataboxRuler

+

Gets the orientation of the (horizontal or vertical).

+

Return value: Orientation of the .

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_get_range (GtkDataboxRuler * ruler,
gdouble * lower,
gdouble * upper,
gdouble * position 
)
+
+
+

gtk_databox_ruler_get_range: : a GtkDataboxRuler : location to store lower limit of the ruler, or NULL : location to store upper limit of the ruler, or NULL : location to store the current position of the mark on the ruler, or NULL

+

Retrieves values indicating the range and current position of a GtkDataboxRuler. See gtk_databox_ruler_set_range().

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_scale_type: : A GtkDataboxRuler widget

+

This function returns the scale type of the (linear or logarithmic).

+

Return value: The scale type (linear or logarithmic)

+ +
+
+ +
+
+ + + + + + + + +
PangoAlignment gtk_databox_ruler_get_text_alignment (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_text_alignment: : a GtkDataboxRuler

+

Gets the text alignment of the (vertical). Vertical rulers with vertical text do not use this flag

+

Return value: Text alignment of the .

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_text_hoffset: : a GtkDataboxRuler

+

Gets the text x (horizontal) offset of the .

+

Return value: Text horizontal (x) offset of the .

+ +
+
+ +
+
+ + + + + + + + +
GtkOrientation gtk_databox_ruler_get_text_orientation (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_text_orientation: : a GtkDataboxRuler

+

Gets the text orientation of the (horizontal or vertical). Horizontal rulers always have horizontal text

+

Return value: Text orientation of the .

+ +
+
+ +
+
+ + + + + + + + +
GtkWidget* gtk_databox_ruler_new (GtkOrientation orientation)
+
+
+

gtk_databox_ruler_new: : orientation of the ruler

+

Creates a new GtkDataboxRuler widget with the given (horizontal or vertical).

+

Return value: A new GtkDataboxRuler

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_box_shadow (GtkDataboxRuler * ruler,
GtkShadowType which_shadow 
)
+
+
+

gtk_databox_ruler_set_box_shadow: : a GtkDataboxRuler : How to render the box shadow on the ruler edges.

+

Sets the shadow type when using gtk_paint_box. This will draw the desired edge shadow.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_draw_position (GtkDataboxRuler * ruler,
gboolean draw 
)
+
+
+

gtk_databox_ruler_set_draw_position: : a GtkDataboxRuler : whether to draw the position arrows on the ruler at all

+

Sets the option for drawing the position arrows. If false, don't draw any arrows, If true draw arrows.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_draw_subticks (GtkDataboxRuler * ruler,
gboolean draw 
)
+
+
+

gtk_databox_ruler_set_draw_subticks: : a GtkDataboxRuler : whether to draw the subticks on the ruler

+

Sets the option for drawing the subticks

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_draw_ticks (GtkDataboxRuler * ruler,
gboolean draw 
)
+
+
+

gtk_databox_ruler_set_draw_ticks: : a GtkDataboxRuler : whether to draw the ticks on the ruler at all

+

Sets the option for drawing the ticks. If false, don't draw any ticks, If true draw major ticks and subticks if the draw_subticks boolean is set.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_invert_edge (GtkDataboxRuler * ruler,
gboolean invert 
)
+
+
+

gtk_databox_ruler_set_invert_edge: : a GtkDataboxRuler : whether to draw the ruler detail with the edge inverted

+

Sets the option for drawing the ruler detail on the opposite edge

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_linear_label_format (GtkDataboxRuler * ruler,
gchar * format 
)
+
+
+

gtk_databox_ruler_set_linear_label_format: : a GtkDataboxRuler : How to format the labels for linear rulers

+

Sets the meta format string for the labels of linear rulers, for example "%%+-%dg" will become "%+-#g" where # is the int variable

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_log_label_format (GtkDataboxRuler * ruler,
gchar * format 
)
+
+
+

gtk_databox_ruler_set_log_label_format: : a GtkDataboxRuler : How to format the labels for log scaled rulers

+

Sets the meta format string for the labels of log scaled rulers, for example "%%-%dg" will become "%-#g" where # is the int variable

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_manual_tick_cnt (GtkDataboxRuler * ruler,
guint manual_tick_cnt 
)
+
+
+

gtk_databox_grid_set_manual_tick_cnt: : a GtkDataboxRuler : sets the number of manual ticks for the

+

Sets the number of manual ticks for the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_manual_tick_labels (GtkDataboxRuler * ruler,
gchar ** manual_tick_labels 
)
+
+
+

gtk_databox_grid_set_manual_tick_labels: : a GtkDataboxRuler : sets the pointer to the labels for the ticks on the

+

Note: This function should be preceeded by calls to gtk_databox_ruler_set_manual_ticks() and gtk_databox_ruler_set_manual_tick_cnt(). The number of tick labels should match gtk_databox_ruler_get_manual_tick_cnt().

+

Sets the tick labels of the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_manual_ticks (GtkDataboxRuler * ruler,
gfloat * manual_ticks 
)
+
+
+

gtk_databox_grid_set_manual_ticks: : a GtkDataboxRuler : sets the pointer to the hline values for the

+

Sets the ticks for the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_max_length (GtkDataboxRuler * ruler,
guint max_length 
)
+
+
+

gtk_databox_ruler_set_max_length: : A GtkDataboxRuler widget : Maximum length (digits) of tick labels

+

This function sets the maximum number of digits to be used for each tick label of the .

+

The cannot be smaller than 2 and not bigger than GTK_DATABOX_RULER_MAX_MAX_LENGTH.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_orientation (GtkDataboxRuler * ruler,
GtkOrientation orientation 
)
+
+
+

gtk_databox_ruler_set_orientation: : a GtkDataboxRuler : new orientation of the ruler

+

Sets the orientation of the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_range (GtkDataboxRuler * ruler,
gdouble lower,
gdouble upper,
gdouble position 
)
+
+
+

gtk_databox_ruler_set_range: : a GtkDataboxRuler : lower limit of the ruler : upper limit of the ruler : current position of the mark on the ruler

+

Sets values indicating the range and current position of a GtkDataboxRuler.

+

See gtk_databox_ruler_get_range().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_scale_type (GtkDataboxRuler * ruler,
GtkDataboxScaleType scale_type 
)
+
+
+

gtk_databox_ruler_set_scale_type: : A GtkDataboxRuler widget : The new scale type for (linear or logarithmic)

+

This function sets the scale type of the .

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_text_alignment (GtkDataboxRuler * ruler,
PangoAlignment alignment 
)
+
+
+

gtk_databox_ruler_set_text_alignment: : a GtkDataboxRuler : new alignment of the tick label in the vertical ruler when horizontal text is set

+

Sets the text alignment of the (vertical with horizontal text).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler * ruler,
gint offset 
)
+
+
+

gtk_databox_ruler_set_text_hoffset: : a GtkDataboxRuler : new x offset of the tick label in the ruler

+

Sets the text x (horizontal) offset of the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_text_orientation (GtkDataboxRuler * ruler,
GtkOrientation orientation 
)
+
+
+

gtk_databox_ruler_set_text_orientation: : a GtkDataboxRuler : new orientation of the tick marks in the vertical ruler

+

Sets the text orientation of the (vertical).

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,56 @@ +var gtkdatabox__ruler_8c = +[ + [ "__GTK_DATABOX_RULER_C__", "gtkdatabox__ruler_8c.html#af078906efb7dd099b1d2cc55271f6ffd", null ], + [ "FORMAT_LENGTH", "gtkdatabox__ruler_8c.html#ad030719d0f89ae3d2b294deb165819b4", null ], + [ "LINEAR_FORMAT_MARKUP", "gtkdatabox__ruler_8c.html#a8e8f7261ecdbdb0355876f1fc0ffe710", null ], + [ "LOG_FORMAT_MARKUP", "gtkdatabox__ruler_8c.html#adf7bd3b9f437de7e636e69513ba26040", null ], + [ "ROUND", "gtkdatabox__ruler_8c.html#acd66e8cacf954c3bc3bba81d09425a12", null ], + [ "RULER_SIZE", "gtkdatabox__ruler_8c.html#a402117fc59e44bfa60057c4f3ff8efff", null ], + [ "gtk_databox_ruler_class_init", "gtkdatabox__ruler_8c.html#a8eecc3deddc3aee1bf39a41a4f31900d", null ], + [ "gtk_databox_ruler_draw_pos", "gtkdatabox__ruler_8c.html#a11dcdecbe3fcce2f13a6b5a5cfafd63a", null ], + [ "gtk_databox_ruler_draw_ticks", "gtkdatabox__ruler_8c.html#af7904e9be9752086ce919750c2e9c9be", null ], + [ "gtk_databox_ruler_expose", "gtkdatabox__ruler_8c.html#a9ef37e32be6ba1a7563bd330998c6a4d", null ], + [ "gtk_databox_ruler_get_box_shadow", "gtkdatabox__ruler_8c.html#afd949997f427cb6bf63d969c21073cc1", null ], + [ "gtk_databox_ruler_get_draw_position", "gtkdatabox__ruler_8c.html#a84ba3228e903be463c65080128325003", null ], + [ "gtk_databox_ruler_get_draw_subticks", "gtkdatabox__ruler_8c.html#a712d80e9fd1250a184b6e315e98d1c9c", null ], + [ "gtk_databox_ruler_get_draw_ticks", "gtkdatabox__ruler_8c.html#a4d71326c29d837dbf238347dca3a1a0f", null ], + [ "gtk_databox_ruler_get_invert_edge", "gtkdatabox__ruler_8c.html#a870ca707c58c3f40c7465e885ed02a2c", null ], + [ "gtk_databox_ruler_get_linear_label_format", "gtkdatabox__ruler_8c.html#a0820f6aca05679fa3219929d114b7a33", null ], + [ "gtk_databox_ruler_get_log_label_format", "gtkdatabox__ruler_8c.html#a3e77789d63799cd574e36bfe77690f77", null ], + [ "gtk_databox_ruler_get_manual_tick_cnt", "gtkdatabox__ruler_8c.html#af3a8b63d7cf24b7216476ab4413849a1", null ], + [ "gtk_databox_ruler_get_manual_tick_labels", "gtkdatabox__ruler_8c.html#a719557baa104a0fdea05f07fa2cb6d0e", null ], + [ "gtk_databox_ruler_get_manual_ticks", "gtkdatabox__ruler_8c.html#afa7ddb51027fdbb98f68b71cfc0e5fb3", null ], + [ "gtk_databox_ruler_get_max_length", "gtkdatabox__ruler_8c.html#a97114c531fba32b4a2d956e639659d71", null ], + [ "gtk_databox_ruler_get_orientation", "gtkdatabox__ruler_8c.html#a52a22dba19a50a4827cef2fcd9f31187", null ], + [ "gtk_databox_ruler_get_property", "gtkdatabox__ruler_8c.html#afe33b1d7b8e99f81c41c8a6c2a9b2d18", null ], + [ "gtk_databox_ruler_get_range", "gtkdatabox__ruler_8c.html#a34a06b59bb79fa9a415ce5dd4a4a4209", null ], + [ "gtk_databox_ruler_get_scale_type", "gtkdatabox__ruler_8c.html#a0057ab7c52554ae721c56ce8b7c41b30", null ], + [ "gtk_databox_ruler_get_text_alignment", "gtkdatabox__ruler_8c.html#aec0fe8d24adcd538af524b94126e0919", null ], + [ "gtk_databox_ruler_get_text_hoffset", "gtkdatabox__ruler_8c.html#a3fd415fcde8c203c5c3a82a394af404b", null ], + [ "gtk_databox_ruler_get_text_orientation", "gtkdatabox__ruler_8c.html#ab515297ea33531dee96a97bb88411618", null ], + [ "gtk_databox_ruler_init", "gtkdatabox__ruler_8c.html#ae1557927377c35a3a79b3785a67c2a8e", null ], + [ "gtk_databox_ruler_make_pixmap", "gtkdatabox__ruler_8c.html#a4a271a850553970980be387c4d80e8c5", null ], + [ "gtk_databox_ruler_motion_notify", "gtkdatabox__ruler_8c.html#a654073cb4a63fa3360adccb47512520e", null ], + [ "gtk_databox_ruler_new", "gtkdatabox__ruler_8c.html#acbdeede9622a59dbf3aff023bcc6e618", null ], + [ "gtk_databox_ruler_realize", "gtkdatabox__ruler_8c.html#a1e7c2d2d43dd91c00b5f07ccf4fc14db", null ], + [ "gtk_databox_ruler_set_box_shadow", "gtkdatabox__ruler_8c.html#abfb82f96ec27e3dd8239889b249426a5", null ], + [ "gtk_databox_ruler_set_draw_position", "gtkdatabox__ruler_8c.html#a4fefcd01aff3e4208127c9c595faf6fd", null ], + [ "gtk_databox_ruler_set_draw_subticks", "gtkdatabox__ruler_8c.html#a7e6f245cb84c0b9a2f21236809ba77f5", null ], + [ "gtk_databox_ruler_set_draw_ticks", "gtkdatabox__ruler_8c.html#a6ad098bd19167d40ed0b54d64a72bd51", null ], + [ "gtk_databox_ruler_set_invert_edge", "gtkdatabox__ruler_8c.html#a5c52c6146a833875ed832b8ac6871fff", null ], + [ "gtk_databox_ruler_set_linear_label_format", "gtkdatabox__ruler_8c.html#ab0b0c6cd68224908eac4646c724e9106", null ], + [ "gtk_databox_ruler_set_log_label_format", "gtkdatabox__ruler_8c.html#a43443ccfc73517c3219779450523fb7d", null ], + [ "gtk_databox_ruler_set_manual_tick_cnt", "gtkdatabox__ruler_8c.html#a8374be0341c10293f86528304c881ff6", null ], + [ "gtk_databox_ruler_set_manual_tick_labels", "gtkdatabox__ruler_8c.html#a0889205ff6258599a8903ea951b32113", null ], + [ "gtk_databox_ruler_set_manual_ticks", "gtkdatabox__ruler_8c.html#a13efe3e7d0768a643a72cb1658164bc2", null ], + [ "gtk_databox_ruler_set_max_length", "gtkdatabox__ruler_8c.html#ae5b33288528385b3decf0d0b1c1b7d7d", null ], + [ "gtk_databox_ruler_set_orientation", "gtkdatabox__ruler_8c.html#ac62fb8d290b0c4103db5d35d0a36408f", null ], + [ "gtk_databox_ruler_set_property", "gtkdatabox__ruler_8c.html#a130478d3b93352a4edc45482d1c4c7c9", null ], + [ "gtk_databox_ruler_set_range", "gtkdatabox__ruler_8c.html#af58ba015a1b9679e5272632b09a59a93", null ], + [ "gtk_databox_ruler_set_scale_type", "gtkdatabox__ruler_8c.html#a844c6ed12be66e75471179ad4551b3fb", null ], + [ "gtk_databox_ruler_set_text_alignment", "gtkdatabox__ruler_8c.html#ade9f47917affb92cb21b7e0365ad5410", null ], + [ "gtk_databox_ruler_set_text_hoffset", "gtkdatabox__ruler_8c.html#acf201850208ed61f48eda84f2ddaa799", null ], + [ "gtk_databox_ruler_set_text_orientation", "gtkdatabox__ruler_8c.html#a2d1d5fb33016488787b298a6b2aaaaac", null ], + [ "gtk_databox_ruler_size_allocate", "gtkdatabox__ruler_8c.html#a2f90e333b1612a2265cedc06b743e4db", null ], + [ "gtk_databox_ruler_unrealize", "gtkdatabox__ruler_8c.html#a84bb673c4281f9503c6745c6700f78a3", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c__incl.md5 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1 @@ +504e26a8b7c4dd3a98f0c94fe83fbacb \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +d83cb04e6868da4f673d15fb848358a2 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a52a22dba19a50a4827cef2fcd9f31187_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +40e1f4e696d68ca3c19bcc71e6d6c1e8 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a5c52c6146a833875ed832b8ac6871fff_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +f2b062ad866ebf2fef83987f5f6a0ae1 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_a844c6ed12be66e75471179ad4551b3fb_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +fac0907fed781c6cc09d32bd39495938 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8c_acbdeede9622a59dbf3aff023bcc6e618_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,1309 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_ruler.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_ruler.h File Reference
+
+
+
#include <gdk/gdk.h>
+#include <gtk/gtkwidget.h>
+#include <gtkdatabox_scale.h>
+
+Include dependency graph for gtkdatabox_ruler.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxRuler
struct  _GtkDataboxRulerClass

+Defines

#define GTK_DATABOX_TYPE_RULER   (gtk_databox_ruler_get_type ())
#define GTK_DATABOX_RULER(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_DATABOX_TYPE_RULER, GtkDataboxRuler))
#define GTK_DATABOX_RULER_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_DATABOX_TYPE_RULER, GtkDataboxRulerClass))
#define GTK_DATABOX_IS_RULER(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_DATABOX_TYPE_RULER))
#define GTK_DATABOX_IS_RULER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_DATABOX_TYPE_RULER))
#define GTK_DATABOX_RULER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_DATABOX_TYPE_RULER, GtkDataboxRulerClass))
#define GTK_DATABOX_RULER_MAX_MAX_LENGTH   63

+Typedefs

typedef struct _GtkDataboxRuler GtkDataboxRuler
typedef struct
+_GtkDataboxRulerClass 		GtkDataboxRulerClass
typedef struct
+_GtkDataboxRulerPrivate 		GtkDataboxRulerPrivate

+Functions

GType gtk_databox_ruler_get_type (void) G_GNUC_CONST
GtkWidget * gtk_databox_ruler_new (GtkOrientation orientation)
void gtk_databox_ruler_set_range (GtkDataboxRuler *ruler, gdouble lower, gdouble upper, gdouble position)
void gtk_databox_ruler_set_max_length (GtkDataboxRuler *ruler, guint max_length)
void gtk_databox_ruler_set_scale_type (GtkDataboxRuler *ruler, guint scale_type)
void gtk_databox_ruler_get_range (GtkDataboxRuler *ruler, gdouble *lower, gdouble *upper, gdouble *position)
guint gtk_databox_ruler_get_max_length (GtkDataboxRuler *ruler)
GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_orientation (GtkDataboxRuler *ruler, GtkOrientation orientation)
GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_text_orientation (GtkDataboxRuler *ruler, GtkOrientation orientation)
GtkOrientation gtk_databox_ruler_get_text_orientation (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_text_alignment (GtkDataboxRuler *ruler, PangoAlignment alignment)
PangoAlignment gtk_databox_ruler_get_text_alignment (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler *ruler, gint offset)
gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_draw_ticks (GtkDataboxRuler *ruler, gboolean draw)
gboolean gtk_databox_ruler_get_draw_ticks (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_draw_position (GtkDataboxRuler *ruler, gboolean draw)
gboolean gtk_databox_ruler_get_draw_position (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_draw_subticks (GtkDataboxRuler *ruler, gboolean draw)
gboolean gtk_databox_ruler_get_draw_subticks (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_invert_edge (GtkDataboxRuler *ruler, gboolean invert)
gboolean gtk_databox_ruler_get_invert_edge (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_linear_label_format (GtkDataboxRuler *ruler, gchar *format)
void gtk_databox_ruler_set_log_label_format (GtkDataboxRuler *ruler, gchar *format)
gchar * gtk_databox_ruler_get_linear_label_format (GtkDataboxRuler *ruler)
gchar * gtk_databox_ruler_get_log_label_format (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_manual_ticks (GtkDataboxRuler *ruler, gfloat *manual_ticks)
gfloat * gtk_databox_ruler_get_manual_ticks (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_manual_tick_cnt (GtkDataboxRuler *ruler, guint manual_tick_cnt)
guint gtk_databox_ruler_get_manual_tick_cnt (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_manual_tick_labels (GtkDataboxRuler *ruler, gchar *labels[])
gchar ** gtk_databox_ruler_get_manual_tick_labels (GtkDataboxRuler *ruler)
void gtk_databox_ruler_set_box_shadow (GtkDataboxRuler *ruler, GtkShadowType which_shadow)
GtkShadowType gtk_databox_ruler_get_box_shadow (GtkDataboxRuler *ruler)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_RULER( obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_DATABOX_TYPE_RULER))
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_RULER_CLASS( klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_DATABOX_TYPE_RULER))
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_RULER( obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_DATABOX_TYPE_RULER, GtkDataboxRuler))
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_RULER_CLASS( klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_DATABOX_TYPE_RULER, GtkDataboxRulerClass))
+
+
+ +
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_RULER_GET_CLASS( obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_DATABOX_TYPE_RULER, GtkDataboxRulerClass))
+
+
+ +
+
+ +
+
+ + + + +
#define GTK_DATABOX_RULER_MAX_MAX_LENGTH   63
+
+
+

GTK_DATABOX_RULER_MAX_MAX_LENGTH

+

The maximum upper limit of label length in characters

+ +
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_RULER   (gtk_databox_ruler_get_type ())
+
+
+

SECTION:gtkdatabox_ruler : An improved version of the #GtkRuler. gtkdatabox_ruler.h : GtkDatabox

+

GtkDataboxRuler is a widget for the GTK+ library similar to GtkRuler.

+

It is improved in several ways:

+

<itemizedlist> <listitem>

+

It supports linear and logarithmic scales.

+

</listitem> <listitem>

+

In the vertical orientation, the labels are rotated 90° (instead of being written as a vertical column of horizontal characters). This increases readability.

+

</listitem> <listitem>

+

It works for very small and very large value ranges.

+

</listitem> </itemizedlist>

+ +
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxRuler GtkDataboxRuler
+
+
+

GtkDataboxRuler:

+

An improved version (see above) of GtkRuler which supports linear and logarithmic scales.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxRulerClass GtkDataboxRulerClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxRulerPrivate GtkDataboxRulerPrivate
+
+
+

GtkDataboxRulerPrivate

+

A private data structure used by the GtkDataboxRuler. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GtkShadowType gtk_databox_ruler_get_box_shadow (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_box_shadow: : a GtkDataboxRuler

+

Gets the type of shadow being rendered to the (GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT).

+

Return value: The currently used shadow type of the , -1 on failure.

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_draw_position (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_draw_position: : a GtkDataboxRuler

+

Gets the draw position arrows option from the (horizontal or vertical).

+

Return value: Position drawing option of the .

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_draw_subticks (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_draw_subticks: : a GtkDataboxRuler

+

Gets the draw subticks option from the (horizontal or vertical).

+

Return value: Subtick drawing option of the .

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_draw_ticks (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_draw_ticks: : a GtkDataboxRuler

+

Gets the draw ticks option from the (horizontal or vertical).

+

Return value: Tick drawing option of the .

+ +
+
+ +
+
+ + + + + + + + +
gboolean gtk_databox_ruler_get_invert_edge (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_invert_edge: : a GtkDataboxRuler

+

Gets the invert edge option from the (horizontal or vertical).

+

Return value: Edge inversion option of the .

+ +
+
+ +
+
+ + + + + + + + +
gchar* gtk_databox_ruler_get_linear_label_format (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_linear_label_format: : a GtkDataboxRuler

+

Gets the linear label meta format of the (horizontal or vertical).

+

Return value: The string meta format the NULL on failure.

+ +
+
+ +
+
+ + + + + + + + +
gchar* gtk_databox_ruler_get_log_label_format (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_log_label_format: : a GtkDataboxRuler

+

Gets the log label meta format of the (horizontal or vertical).

+

Return value: The string meta format the , NULL on failure.

+ +
+
+ +
+
+ + + + + + + + +
guint gtk_databox_ruler_get_manual_tick_cnt (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_grid_get_manual_tick_cnt: : a GtkDataboxRuler

+

Gets the number manual tick values for the .

+

Return value: The number of manual tick values for the .

+ +
+
+ +
+
+ + + + + + + + +
gchar** gtk_databox_ruler_get_manual_tick_labels (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_grid_get_manual_tick_labels: : a GtkDataboxRuler

+

Gets the pointer to the manual tick labels for the .

+

Return value: Pointer to the manual tick labels for the .

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_ruler_get_manual_ticks (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_grid_get_manual_ticks: : a GtkDataboxRuler

+

Gets the pointer to the manual tick values for the .

+

Return value: Pointer to the manual tick values for the .

+ +
+
+ +
+
+ + + + + + + + +
guint gtk_databox_ruler_get_max_length (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_max_length: : A GtkDataboxRuler widget

+

This function returns the maximum number of digits to be used for each tick label of the .

+

Return value: The maximum length of the tick labels.

+ +
+
+ +
+
+ + + + + + + + +
GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_orientation: : a GtkDataboxRuler

+

Gets the orientation of the (horizontal or vertical).

+

Return value: Orientation of the .

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_get_range (GtkDataboxRuler * ruler,
gdouble * lower,
gdouble * upper,
gdouble * position 
)
+
+
+

gtk_databox_ruler_get_range: : a GtkDataboxRuler : location to store lower limit of the ruler, or NULL : location to store upper limit of the ruler, or NULL : location to store the current position of the mark on the ruler, or NULL

+

Retrieves values indicating the range and current position of a GtkDataboxRuler. See gtk_databox_ruler_set_range().

+ +
+
+ +
+
+ + + + + + + + +
GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_scale_type: : A GtkDataboxRuler widget

+

This function returns the scale type of the (linear or logarithmic).

+

Return value: The scale type (linear or logarithmic)

+ +
+
+ +
+
+ + + + + + + + +
PangoAlignment gtk_databox_ruler_get_text_alignment (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_text_alignment: : a GtkDataboxRuler

+

Gets the text alignment of the (vertical). Vertical rulers with vertical text do not use this flag

+

Return value: Text alignment of the .

+ +
+
+ +
+
+ + + + + + + + +
gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_text_hoffset: : a GtkDataboxRuler

+

Gets the text x (horizontal) offset of the .

+

Return value: Text horizontal (x) offset of the .

+ +
+
+ +
+
+ + + + + + + + +
GtkOrientation gtk_databox_ruler_get_text_orientation (GtkDataboxRuler * ruler)
+
+
+

gtk_databox_ruler_get_text_orientation: : a GtkDataboxRuler

+

Gets the text orientation of the (horizontal or vertical). Horizontal rulers always have horizontal text

+

Return value: Text orientation of the .

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_ruler_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
GtkWidget* gtk_databox_ruler_new (GtkOrientation orientation)
+
+
+

gtk_databox_ruler_new: : orientation of the ruler

+

Creates a new GtkDataboxRuler widget with the given (horizontal or vertical).

+

Return value: A new GtkDataboxRuler

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_box_shadow (GtkDataboxRuler * ruler,
GtkShadowType which_shadow 
)
+
+
+

gtk_databox_ruler_set_box_shadow: : a GtkDataboxRuler : How to render the box shadow on the ruler edges.

+

Sets the shadow type when using gtk_paint_box. This will draw the desired edge shadow.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_draw_position (GtkDataboxRuler * ruler,
gboolean draw 
)
+
+
+

gtk_databox_ruler_set_draw_position: : a GtkDataboxRuler : whether to draw the position arrows on the ruler at all

+

Sets the option for drawing the position arrows. If false, don't draw any arrows, If true draw arrows.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_draw_subticks (GtkDataboxRuler * ruler,
gboolean draw 
)
+
+
+

gtk_databox_ruler_set_draw_subticks: : a GtkDataboxRuler : whether to draw the subticks on the ruler

+

Sets the option for drawing the subticks

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_draw_ticks (GtkDataboxRuler * ruler,
gboolean draw 
)
+
+
+

gtk_databox_ruler_set_draw_ticks: : a GtkDataboxRuler : whether to draw the ticks on the ruler at all

+

Sets the option for drawing the ticks. If false, don't draw any ticks, If true draw major ticks and subticks if the draw_subticks boolean is set.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_invert_edge (GtkDataboxRuler * ruler,
gboolean invert 
)
+
+
+

gtk_databox_ruler_set_invert_edge: : a GtkDataboxRuler : whether to draw the ruler detail with the edge inverted

+

Sets the option for drawing the ruler detail on the opposite edge

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_linear_label_format (GtkDataboxRuler * ruler,
gchar * format 
)
+
+
+

gtk_databox_ruler_set_linear_label_format: : a GtkDataboxRuler : How to format the labels for linear rulers

+

Sets the meta format string for the labels of linear rulers, for example "%%+-%dg" will become "%+-#g" where # is the int variable

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_log_label_format (GtkDataboxRuler * ruler,
gchar * format 
)
+
+
+

gtk_databox_ruler_set_log_label_format: : a GtkDataboxRuler : How to format the labels for log scaled rulers

+

Sets the meta format string for the labels of log scaled rulers, for example "%%-%dg" will become "%-#g" where # is the int variable

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_manual_tick_cnt (GtkDataboxRuler * ruler,
guint manual_tick_cnt 
)
+
+
+

gtk_databox_grid_set_manual_tick_cnt: : a GtkDataboxRuler : sets the number of manual ticks for the

+

Sets the number of manual ticks for the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_manual_tick_labels (GtkDataboxRuler * ruler,
gchar * labels[] 
)
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_manual_ticks (GtkDataboxRuler * ruler,
gfloat * manual_ticks 
)
+
+
+

gtk_databox_grid_set_manual_ticks: : a GtkDataboxRuler : sets the pointer to the hline values for the

+

Sets the ticks for the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_max_length (GtkDataboxRuler * ruler,
guint max_length 
)
+
+
+

gtk_databox_ruler_set_max_length: : A GtkDataboxRuler widget : Maximum length (digits) of tick labels

+

This function sets the maximum number of digits to be used for each tick label of the .

+

The cannot be smaller than 2 and not bigger than GTK_DATABOX_RULER_MAX_MAX_LENGTH.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_orientation (GtkDataboxRuler * ruler,
GtkOrientation orientation 
)
+
+
+

gtk_databox_ruler_set_orientation: : a GtkDataboxRuler : new orientation of the ruler

+

Sets the orientation of the (horizontal or vertical).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_range (GtkDataboxRuler * ruler,
gdouble lower,
gdouble upper,
gdouble position 
)
+
+
+

gtk_databox_ruler_set_range: : a GtkDataboxRuler : lower limit of the ruler : upper limit of the ruler : current position of the mark on the ruler

+

Sets values indicating the range and current position of a GtkDataboxRuler.

+

See gtk_databox_ruler_get_range().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_scale_type (GtkDataboxRuler * ruler,
guint scale_type 
)
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_text_alignment (GtkDataboxRuler * ruler,
PangoAlignment alignment 
)
+
+
+

gtk_databox_ruler_set_text_alignment: : a GtkDataboxRuler : new alignment of the tick label in the vertical ruler when horizontal text is set

+

Sets the text alignment of the (vertical with horizontal text).

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler * ruler,
gint offset 
)
+
+
+

gtk_databox_ruler_set_text_hoffset: : a GtkDataboxRuler : new x offset of the tick label in the ruler

+

Sets the text x (horizontal) offset of the .

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void gtk_databox_ruler_set_text_orientation (GtkDataboxRuler * ruler,
GtkOrientation orientation 
)
+
+
+

gtk_databox_ruler_set_text_orientation: : a GtkDataboxRuler : new orientation of the tick marks in the vertical ruler

+

Sets the text orientation of the (vertical).

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,49 @@ +var gtkdatabox__ruler_8h = +[ + [ "GTK_DATABOX_IS_RULER", "gtkdatabox__ruler_8h.html#a03a3f3841d83a5096416a33fc26131a3", null ], + [ "GTK_DATABOX_IS_RULER_CLASS", "gtkdatabox__ruler_8h.html#a247039bfef50c26c01bb6b62fc95155f", null ], + [ "GTK_DATABOX_RULER", "gtkdatabox__ruler_8h.html#a95f4cb96d1432f8ea3e9c0e939d5b651", null ], + [ "GTK_DATABOX_RULER_CLASS", "gtkdatabox__ruler_8h.html#ab132954a3b98e4a28d6e204df91a248e", null ], + [ "GTK_DATABOX_RULER_GET_CLASS", "gtkdatabox__ruler_8h.html#a9a76ea3827af5e928bde75aabad388a6", null ], + [ "GTK_DATABOX_RULER_MAX_MAX_LENGTH", "gtkdatabox__ruler_8h.html#a078f367f1ca16517f567fd6cfc19c5cc", null ], + [ "GTK_DATABOX_TYPE_RULER", "gtkdatabox__ruler_8h.html#a5298fec9bb31f6aac9dc0f6ce2b1da8c", null ], + [ "GtkDataboxRuler", "gtkdatabox__ruler_8h.html#a6902c41a9a1bed160148d7cc573bd913", null ], + [ "GtkDataboxRulerClass", "gtkdatabox__ruler_8h.html#a7f4dcc0c2447564c32aaee6a8fd1e17c", null ], + [ "GtkDataboxRulerPrivate", "gtkdatabox__ruler_8h.html#a8e910ae7981c6e75ee5af6b74000f18d", null ], + [ "gtk_databox_ruler_get_box_shadow", "gtkdatabox__ruler_8h.html#afd949997f427cb6bf63d969c21073cc1", null ], + [ "gtk_databox_ruler_get_draw_position", "gtkdatabox__ruler_8h.html#a84ba3228e903be463c65080128325003", null ], + [ "gtk_databox_ruler_get_draw_subticks", "gtkdatabox__ruler_8h.html#a712d80e9fd1250a184b6e315e98d1c9c", null ], + [ "gtk_databox_ruler_get_draw_ticks", "gtkdatabox__ruler_8h.html#a4d71326c29d837dbf238347dca3a1a0f", null ], + [ "gtk_databox_ruler_get_invert_edge", "gtkdatabox__ruler_8h.html#a870ca707c58c3f40c7465e885ed02a2c", null ], + [ "gtk_databox_ruler_get_linear_label_format", "gtkdatabox__ruler_8h.html#a0820f6aca05679fa3219929d114b7a33", null ], + [ "gtk_databox_ruler_get_log_label_format", "gtkdatabox__ruler_8h.html#a3e77789d63799cd574e36bfe77690f77", null ], + [ "gtk_databox_ruler_get_manual_tick_cnt", "gtkdatabox__ruler_8h.html#af3a8b63d7cf24b7216476ab4413849a1", null ], + [ "gtk_databox_ruler_get_manual_tick_labels", "gtkdatabox__ruler_8h.html#a719557baa104a0fdea05f07fa2cb6d0e", null ], + [ "gtk_databox_ruler_get_manual_ticks", "gtkdatabox__ruler_8h.html#afa7ddb51027fdbb98f68b71cfc0e5fb3", null ], + [ "gtk_databox_ruler_get_max_length", "gtkdatabox__ruler_8h.html#a97114c531fba32b4a2d956e639659d71", null ], + [ "gtk_databox_ruler_get_orientation", "gtkdatabox__ruler_8h.html#a52a22dba19a50a4827cef2fcd9f31187", null ], + [ "gtk_databox_ruler_get_range", "gtkdatabox__ruler_8h.html#a34a06b59bb79fa9a415ce5dd4a4a4209", null ], + [ "gtk_databox_ruler_get_scale_type", "gtkdatabox__ruler_8h.html#a0057ab7c52554ae721c56ce8b7c41b30", null ], + [ "gtk_databox_ruler_get_text_alignment", "gtkdatabox__ruler_8h.html#aec0fe8d24adcd538af524b94126e0919", null ], + [ "gtk_databox_ruler_get_text_hoffset", "gtkdatabox__ruler_8h.html#a3fd415fcde8c203c5c3a82a394af404b", null ], + [ "gtk_databox_ruler_get_text_orientation", "gtkdatabox__ruler_8h.html#ab515297ea33531dee96a97bb88411618", null ], + [ "gtk_databox_ruler_get_type", "gtkdatabox__ruler_8h.html#af1ed4fe63c30a2e3f939c0c3ab127a50", null ], + [ "gtk_databox_ruler_new", "gtkdatabox__ruler_8h.html#acbdeede9622a59dbf3aff023bcc6e618", null ], + [ "gtk_databox_ruler_set_box_shadow", "gtkdatabox__ruler_8h.html#abfb82f96ec27e3dd8239889b249426a5", null ], + [ "gtk_databox_ruler_set_draw_position", "gtkdatabox__ruler_8h.html#a4fefcd01aff3e4208127c9c595faf6fd", null ], + [ "gtk_databox_ruler_set_draw_subticks", "gtkdatabox__ruler_8h.html#a7e6f245cb84c0b9a2f21236809ba77f5", null ], + [ "gtk_databox_ruler_set_draw_ticks", "gtkdatabox__ruler_8h.html#a6ad098bd19167d40ed0b54d64a72bd51", null ], + [ "gtk_databox_ruler_set_invert_edge", "gtkdatabox__ruler_8h.html#a5c52c6146a833875ed832b8ac6871fff", null ], + [ "gtk_databox_ruler_set_linear_label_format", "gtkdatabox__ruler_8h.html#ab0b0c6cd68224908eac4646c724e9106", null ], + [ "gtk_databox_ruler_set_log_label_format", "gtkdatabox__ruler_8h.html#a43443ccfc73517c3219779450523fb7d", null ], + [ "gtk_databox_ruler_set_manual_tick_cnt", "gtkdatabox__ruler_8h.html#a8374be0341c10293f86528304c881ff6", null ], + [ "gtk_databox_ruler_set_manual_tick_labels", "gtkdatabox__ruler_8h.html#a8724ec0afe0137337f8544d7bf8d92fd", null ], + [ "gtk_databox_ruler_set_manual_ticks", "gtkdatabox__ruler_8h.html#a13efe3e7d0768a643a72cb1658164bc2", null ], + [ "gtk_databox_ruler_set_max_length", "gtkdatabox__ruler_8h.html#ae5b33288528385b3decf0d0b1c1b7d7d", null ], + [ "gtk_databox_ruler_set_orientation", "gtkdatabox__ruler_8h.html#ac62fb8d290b0c4103db5d35d0a36408f", null ], + [ "gtk_databox_ruler_set_range", "gtkdatabox__ruler_8h.html#af58ba015a1b9679e5272632b09a59a93", null ], + [ "gtk_databox_ruler_set_scale_type", "gtkdatabox__ruler_8h.html#a26c9d9305ee05d365baac52cdac47035", null ], + [ "gtk_databox_ruler_set_text_alignment", "gtkdatabox__ruler_8h.html#ade9f47917affb92cb21b7e0365ad5410", null ], + [ "gtk_databox_ruler_set_text_hoffset", "gtkdatabox__ruler_8h.html#acf201850208ed61f48eda84f2ddaa799", null ], + [ "gtk_databox_ruler_set_text_orientation", "gtkdatabox__ruler_8h.html#a2d1d5fb33016488787b298a6b2aaaaac", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__dep__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__dep__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +0bb2830ef8cf00ad162d4b9dbbf876b9 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +db8a672a398b1e64063aaa3a43bbf164 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +d83cb04e6868da4f673d15fb848358a2 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a52a22dba19a50a4827cef2fcd9f31187_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +40e1f4e696d68ca3c19bcc71e6d6c1e8 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_a5c52c6146a833875ed832b8ac6871fff_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +fac0907fed781c6cc09d32bd39495938 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_acbdeede9622a59dbf3aff023bcc6e618_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__ruler_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__ruler_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,262 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_ruler.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_ruler.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_ruler.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GTK - The GIMP Toolkit
+00003  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+00004  *
+00005  * This library is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public
+00007  * License as published by the Free Software Foundation; either
+00008  * version 2 of the License, or (at your option) any later version.
+00009  *
+00010  * This library is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+00013  * Lesser General Public License for more details.
+00014  *
+00015  * You should have received a copy of the GNU Lesser General Public
+00016  * License along with this library; if not, write to the
+00017  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+00018  * Boston, MA 02111-1307, USA.
+00019  */
+00020 
+00021 /*
+00022  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+00023  * file for a list of people on the GTK+ Team.  See the ChangeLog
+00024  * files for a list of changes.  These files are distributed with
+00025  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+00026  */
+00027 
+00028 /*
+00029  * Modified by Roland Bock 2007 - 2008.
+00030  */
+00031 
+00061 #ifndef __GTK_DATABOX_RULER_H__
+00062 #define __GTK_DATABOX_RULER_H__
+00063 
+00064 #ifdef _MSC_VER
+00065 #define log2(x) (log(x)/log(2))
+00066 #endif
+00067 
+00068 #include <gdk/gdk.h>
+00069 #include <gtk/gtkwidget.h>
+00070 #include <gtkdatabox_scale.h>
+00071 
+00072 G_BEGIN_DECLS
+00073 #define GTK_DATABOX_TYPE_RULER            (gtk_databox_ruler_get_type ())
+00074 #define GTK_DATABOX_RULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_DATABOX_TYPE_RULER, GtkDataboxRuler))
+00075 #define GTK_DATABOX_RULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_DATABOX_TYPE_RULER, GtkDataboxRulerClass))
+00076 #define GTK_DATABOX_IS_RULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_DATABOX_TYPE_RULER))
+00077 #define GTK_DATABOX_IS_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_DATABOX_TYPE_RULER))
+00078 #define GTK_DATABOX_RULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_DATABOX_TYPE_RULER, GtkDataboxRulerClass))
+00079 
+00085 typedef struct _GtkDataboxRuler GtkDataboxRuler;
+00086 typedef struct _GtkDataboxRulerClass GtkDataboxRulerClass;
+00087 
+00093 #define GTK_DATABOX_RULER_MAX_MAX_LENGTH 63
+00094 
+00102  typedef struct _GtkDataboxRulerPrivate GtkDataboxRulerPrivate;
+00103 
+00104 struct _GtkDataboxRuler
+00105 {
+00106    GtkWidget widget;
+00107 
+00108    GtkDataboxRulerPrivate *priv;
+00109 };
+00110 
+00111 struct _GtkDataboxRulerClass
+00112 {
+00113    GtkWidgetClass parent_class;
+00114 };
+00115 
+00116 
+00117 GType
+00118 gtk_databox_ruler_get_type (void)
+00119    G_GNUC_CONST;
+00120      GtkWidget *gtk_databox_ruler_new (GtkOrientation orientation);
+00121 
+00122      void gtk_databox_ruler_set_range (GtkDataboxRuler * ruler,
+00123                                        gdouble lower,
+00124                                        gdouble upper, gdouble position);
+00125      void gtk_databox_ruler_set_max_length (GtkDataboxRuler * ruler,
+00126                                             guint max_length);
+00127      void gtk_databox_ruler_set_scale_type (GtkDataboxRuler * ruler,
+00128                                             guint scale_type);
+00129 
+00130      void gtk_databox_ruler_get_range (GtkDataboxRuler * ruler,
+00131                                        gdouble * lower,
+00132                                        gdouble * upper, gdouble * position);
+00133      guint gtk_databox_ruler_get_max_length (GtkDataboxRuler * ruler);
+00134      GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler *
+00135                                                            ruler);
+00136 
+00137      void gtk_databox_ruler_set_orientation (GtkDataboxRuler * ruler, GtkOrientation orientation);
+00138      GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler *ruler);
+00139 
+00140      void gtk_databox_ruler_set_text_orientation (GtkDataboxRuler * ruler, GtkOrientation orientation);
+00141      GtkOrientation gtk_databox_ruler_get_text_orientation (GtkDataboxRuler *ruler);
+00142 
+00143      void gtk_databox_ruler_set_text_alignment (GtkDataboxRuler * ruler, PangoAlignment alignment);
+00144      PangoAlignment gtk_databox_ruler_get_text_alignment (GtkDataboxRuler * ruler);
+00145 
+00146     void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler * ruler,gint offset);
+00147     gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler * ruler);
+00148 
+00149      void gtk_databox_ruler_set_draw_ticks(GtkDataboxRuler * ruler, gboolean draw);
+00150     gboolean gtk_databox_ruler_get_draw_ticks(GtkDataboxRuler * ruler);
+00151 
+00152      void gtk_databox_ruler_set_draw_position(GtkDataboxRuler * ruler, gboolean draw);
+00153     gboolean gtk_databox_ruler_get_draw_position(GtkDataboxRuler * ruler);
+00154 
+00155      void gtk_databox_ruler_set_draw_subticks(GtkDataboxRuler * ruler, gboolean draw);
+00156     gboolean gtk_databox_ruler_get_draw_subticks(GtkDataboxRuler * ruler);
+00157 
+00158      void gtk_databox_ruler_set_invert_edge(GtkDataboxRuler * ruler, gboolean invert);
+00159     gboolean gtk_databox_ruler_get_invert_edge(GtkDataboxRuler * ruler);
+00160 
+00161     void gtk_databox_ruler_set_linear_label_format(GtkDataboxRuler * ruler, gchar *format);
+00162     void gtk_databox_ruler_set_log_label_format(GtkDataboxRuler * ruler, gchar *format);
+00163 
+00164     gchar* gtk_databox_ruler_get_linear_label_format(GtkDataboxRuler * ruler);
+00165     gchar* gtk_databox_ruler_get_log_label_format(GtkDataboxRuler * ruler);
+00166 
+00167     void gtk_databox_ruler_set_manual_ticks(GtkDataboxRuler * ruler, gfloat* manual_ticks);
+00168     gfloat* gtk_databox_ruler_get_manual_ticks(GtkDataboxRuler * ruler);
+00169 
+00170     void gtk_databox_ruler_set_manual_tick_cnt(GtkDataboxRuler * ruler, guint manual_tick_cnt);
+00171     guint gtk_databox_ruler_get_manual_tick_cnt(GtkDataboxRuler * ruler);
+00172 
+00173     void gtk_databox_ruler_set_manual_tick_labels(GtkDataboxRuler * ruler, gchar *labels[]);
+00174     gchar ** gtk_databox_ruler_get_manual_tick_labels(GtkDataboxRuler * ruler);
+00175 
+00176     void gtk_databox_ruler_set_box_shadow(GtkDataboxRuler * ruler, GtkShadowType which_shadow);
+00177     GtkShadowType gtk_databox_ruler_get_box_shadow(GtkDataboxRuler * ruler);
+00178 
+00179 G_END_DECLS
+00180 #endif /* __GTK_DATABOX_RULER_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,161 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_scale.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Functions
+
+
gtk/gtkdatabox_scale.c File Reference
+
+
+
#include <gtkdatabox_scale.h>
+
+Include dependency graph for gtkdatabox_scale.c:
+
+
+ + +
+
+ + +

+Functions

GType gtk_databox_scale_type_get_type (void)
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_scale_type_get_type (void )
+
+
+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var gtkdatabox__scale_8c = +[ + [ "gtk_databox_scale_type_get_type", "gtkdatabox__scale_8c.html#a5690c7ba668e3e1a23403eca339da566", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +1ebc3a6512094507a63f61dc006c61a7 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,206 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_scale.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Enumerations | +Functions
+
+
gtk/gtkdatabox_scale.h File Reference
+
+
+
#include <glib-object.h>
+
+Include dependency graph for gtkdatabox_scale.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + +

+Enumerations

enum  GtkDataboxScaleType { GTK_DATABOX_SCALE_LINEAR = 0, +GTK_DATABOX_SCALE_LOG2, +GTK_DATABOX_SCALE_LOG + }

+Functions

GType gtk_databox_scale_type_get_type (void)
+

Detailed Description

+

Currently just an enumeration used in several places...

+

Enumeration Type Documentation

+ +
+
+ + + + +
enum GtkDataboxScaleType
+
+
+

GtkDataboxScaleType: : Linear scale : Logarithmic scale (base 10)

+

Scale type for GtkDatabox and GtkDataboxRuler objects.

+

See also: GtkDatabox:scale_type_x, GtkDatabox:scale_type_y

+
Enumerator:
+ + + +
GTK_DATABOX_SCALE_LINEAR  +
GTK_DATABOX_SCALE_LOG2  +
GTK_DATABOX_SCALE_LOG  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
GType gtk_databox_scale_type_get_type (void )
+
+
+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var gtkdatabox__scale_8h = +[ + [ "GtkDataboxScaleType", "gtkdatabox__scale_8h.html#aac3cf1853dc656d4e0ff6a98228c2132", null ], + [ "gtk_databox_scale_type_get_type", "gtkdatabox__scale_8h.html#a5690c7ba668e3e1a23403eca339da566", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__dep__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__dep__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +113af716293a29fa426e0111a2482201 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,2 @@ + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +64b3488eaae472dcfaa5bc61a97344ad \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__scale_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__scale_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,166 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_scale.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_scale.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_scale.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00027 #ifndef __GTK_DATABOX_SCALE_H__
+00028 #define __GTK_DATABOX_SCALE_H__
+00029 
+00030 #include <glib-object.h>
+00031 
+00032 G_BEGIN_DECLS
+00033 
+00043 typedef enum
+00044 {
+00045    GTK_DATABOX_SCALE_LINEAR = 0,
+00046    GTK_DATABOX_SCALE_LOG2,
+00047    GTK_DATABOX_SCALE_LOG
+00048 }
+00049 GtkDataboxScaleType;
+00050 
+00051 GType gtk_databox_scale_type_get_type (void);
+00052 
+00053 G_END_DECLS
+00054 #endif                          /* __GTK_DATABOX_SCALE_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,187 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_typedefs.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Typedefs
+
+
gtk/gtkdatabox_typedefs.h File Reference
+
+
+
#include <gdk/gdk.h>
+
+Include dependency graph for gtkdatabox_typedefs.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + +

+Typedefs

typedef typedefG_BEGIN_DECLS
+struct _GtkDatabox 		GtkDatabox
typedef struct _GtkDataboxGraph GtkDataboxGraph
+

Typedef Documentation

+ +
+
+ + + + +
typedef typedefG_BEGIN_DECLS struct _GtkDatabox GtkDatabox
+
+
+

GtkDatabox: : The parent object : A private structure containing internal data.

+

A GTK+ widget to display large amounts of numerical data quickly and easily. The numerical data is represented/displayed by GtkDataboxGraph objects, e.g. GtkDataboxPoints.

+

Implemented by _GtkDatabox;

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxGraph GtkDataboxGraph
+
+
+

GtkDataboxGraph : The parent object : A private structure containing internal data.

+

The GtkDataboxGraph is the base class for all kinds of graphs (e.g. lines, points, decorations like coordinate crosses) to be shown in a GtkDatabox wiget.

+

Implemented by _GtkDataboxGraph

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var gtkdatabox__typedefs_8h = +[ + [ "GtkDatabox", "gtkdatabox__typedefs_8h.html#a2dd8fe6143426c8a74158e7ae8120110", null ], + [ "GtkDataboxGraph", "gtkdatabox__typedefs_8h.html#a060721771772bfa7ea3c1065a7074f97", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__dep__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__dep__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +8bbc6d1c4ae14479d688f14c08ba5b0b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__incl.map 2012-11-09 04:01:21.000000000 +0000 @@ -0,0 +1,2 @@ + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +97eb750083e44c9099c0df1e1634f56a \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__typedefs_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__typedefs_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,160 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_typedefs.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_typedefs.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_typedefs.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00020 #ifndef __GTK_DATABOX_TYPEDEFS_H__
+00021 #define __GTK_DATABOX_TYPEDEFS_H__
+00022 
+00023 #include <gdk/gdk.h>
+00024 
+00025 G_BEGIN_DECLS
+00038    typedef struct _GtkDatabox GtkDatabox;
+00039 
+00051 typedef struct _GtkDataboxGraph GtkDataboxGraph;
+00052 G_END_DECLS
+00053 #endif /* __GTK_DATABOX_TYPEDEFS_H__ */
+00054 
+00055 
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,268 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_xyc_graph.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Enumerations | +Functions
+
+
gtk/gtkdatabox_xyc_graph.c File Reference
+
+
+
#include <gtkdatabox_xyc_graph.h>
+
+Include dependency graph for gtkdatabox_xyc_graph.c:
+
+
+ + +
+
+ + + + + + + + + +

+Data Structures

struct  _GtkDataboxXYCGraphPrivate

+Enumerations

enum  { PROP_X = 1, +PROP_Y, +PROP_LEN + }

+Functions

gfloat * gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph *xyc_graph)
gfloat * gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph *xyc_graph)
guint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph *xyc_graph)
GType gtk_databox_xyc_graph_get_type (void)
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + +
PROP_X  +
PROP_Y  +
PROP_LEN  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
guint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph * xyc_graph)
+
+
+

gtk_databox_xyc_graph_get_length: : A GtkDataboxXYCGraph object

+

Gets the the length of the X and Y values arrays.

+

Return value: Length of X/Y arrays.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_xyc_graph_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph * xyc_graph)
+
+
+

gtk_databox_xyc_graph_get_X: : A GtkDataboxXYCGraph object

+

Gets the X values of the .

+

Return value: Pointer to X values

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph * xyc_graph)
+
+
+

gtk_databox_xyc_graph_get_Y: : A GtkDataboxXYCGraph object

+

Gets the Y values of the .

+

Return value: Pointer to Y values

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,17 @@ +var gtkdatabox__xyc__graph_8c = +[ + [ "gtk_databox_xyc_graph_class_init", "gtkdatabox__xyc__graph_8c.html#ae1123ac72af42c8ea8af82a0ba25fede", null ], + [ "gtk_databox_xyc_graph_get_length", "gtkdatabox__xyc__graph_8c.html#acac4c3dcc372b5ed36752042b8a900a1", null ], + [ "gtk_databox_xyc_graph_get_property", "gtkdatabox__xyc__graph_8c.html#a7674fff91a2d601e5709d6107e7df2b1", null ], + [ "gtk_databox_xyc_graph_get_type", "gtkdatabox__xyc__graph_8c.html#a56d63dab090aeaf0f0de0735c73c37f3", null ], + [ "gtk_databox_xyc_graph_get_X", "gtkdatabox__xyc__graph_8c.html#a4e831838680eca0bd69585d2a9fb470e", null ], + [ "gtk_databox_xyc_graph_get_Y", "gtkdatabox__xyc__graph_8c.html#a07439806f7693c841ec1c81bfa0ca85a", null ], + [ "gtk_databox_xyc_graph_instance_init", "gtkdatabox__xyc__graph_8c.html#a484f907395d944e3fb3c31068a0206b3", null ], + [ "gtk_databox_xyc_graph_real_calculate_extrema", "gtkdatabox__xyc__graph_8c.html#a69e18791d5aeb6e26b687a1129545c3d", null ], + [ "gtk_databox_xyc_graph_set_length", "gtkdatabox__xyc__graph_8c.html#a2f84e6132b0a5697735cbb5e877a4df7", null ], + [ "gtk_databox_xyc_graph_set_property", "gtkdatabox__xyc__graph_8c.html#a7d077d77f5041db95e8265d58dd5f2f6", null ], + [ "gtk_databox_xyc_graph_set_X", "gtkdatabox__xyc__graph_8c.html#a0c46a8f124eb3a548638a607ce54425e", null ], + [ "gtk_databox_xyc_graph_set_Y", "gtkdatabox__xyc__graph_8c.html#afeb3655889f96a7841f92a682d702dcd", null ], + [ "xyc_graph_finalize", "gtkdatabox__xyc__graph_8c.html#a72b2a7311bc28f5f2f69ea9a9aeb62ef", null ], + [ "parent_class", "gtkdatabox__xyc__graph_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +318e4bdddbbbd890d03540f7b8dc1266 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +fb3e2062a20dab3fe19d81a5c2f121fd \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8c_acac4c3dcc372b5ed36752042b8a900a1_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,422 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_xyc_graph.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_xyc_graph.h File Reference
+
+
+
#include <gtkdatabox_graph.h>
+
+Include dependency graph for gtkdatabox_xyc_graph.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxXYCGraph
struct  _GtkDataboxXYCGraphClass

+Defines

#define GTK_DATABOX_TYPE_XYC_GRAPH   (gtk_databox_xyc_graph_get_type ())
#define GTK_DATABOX_XYC_GRAPH(obj)
#define GTK_DATABOX_XYC_GRAPH_CLASS(klass)
#define GTK_DATABOX_IS_XYC_GRAPH(obj)
#define GTK_DATABOX_IS_XYC_GRAPH_CLASS(klass)
#define GTK_DATABOX_XYC_GRAPH_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxXYCGraph GtkDataboxXYCGraph
typedef struct
+_GtkDataboxXYCGraphClass 		GtkDataboxXYCGraphClass
typedef struct
+_GtkDataboxXYCGraphPrivate 		GtkDataboxXYCGraphPrivate

+Functions

GType gtk_databox_xyc_graph_get_type (void)
guint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph *xyc_graph)
gfloat * gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph *xyc_graph)
gfloat * gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph *xyc_graph)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_XYC_GRAPH( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_XYC_GRAPH))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_XYC_GRAPH_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_XYC_GRAPH))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_XYC_GRAPH   (gtk_databox_xyc_graph_get_type ())
+
+
+

SECTION:gtkdatabox_xyc_graph : An abstract anchestor for all graphs which display xy-values in one color. gtkdatabox_xyc_graph.h : GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars

+

GtkDataboxXYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented as an array of X values and a second array of Y values. In order to actually display data, you should use one of the derived classes.

+ +
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_XYC_GRAPH( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_XYC_GRAPH, \
+                                           GtkDataboxXYCGraph))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_XYC_GRAPH_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_XYC_GRAPH, \
+                                           GtkDataboxXYCGraphClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_XYC_GRAPH_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_XYC_GRAPH, \
+                                           GtkDataboxXYCGraphClass))
+
+
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxXYCGraph GtkDataboxXYCGraph
+
+
+

GtkDataboxXYCGraph:

+

GtkDataboxXYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented as an array of X values and a second array of Y values. In order to actually display data, you should use one of the derived classes.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxXYCGraphClass GtkDataboxXYCGraphClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxXYCGraphPrivate GtkDataboxXYCGraphPrivate
+
+
+

GtkDataboxXYCGraphPrivate

+

A private data structure used by the GtkDataboxXYCGraph. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
guint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph * xyc_graph)
+
+
+

gtk_databox_xyc_graph_get_length: : A GtkDataboxXYCGraph object

+

Gets the the length of the X and Y values arrays.

+

Return value: Length of X/Y arrays.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_xyc_graph_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph * xyc_graph)
+
+
+

gtk_databox_xyc_graph_get_X: : A GtkDataboxXYCGraph object

+

Gets the X values of the .

+

Return value: Pointer to X values

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph * xyc_graph)
+
+
+

gtk_databox_xyc_graph_get_Y: : A GtkDataboxXYCGraph object

+

Gets the Y values of the .

+

Return value: Pointer to Y values

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,16 @@ +var gtkdatabox__xyc__graph_8h = +[ + [ "GTK_DATABOX_IS_XYC_GRAPH", "gtkdatabox__xyc__graph_8h.html#a254c8b8c720209e439ca5f4059d3b76a", null ], + [ "GTK_DATABOX_IS_XYC_GRAPH_CLASS", "gtkdatabox__xyc__graph_8h.html#a949d625446c83532a021e15b60e5b620", null ], + [ "GTK_DATABOX_TYPE_XYC_GRAPH", "gtkdatabox__xyc__graph_8h.html#ac2c2a0cbfdea05f4e8d9c4a45f4c7388", null ], + [ "GTK_DATABOX_XYC_GRAPH", "gtkdatabox__xyc__graph_8h.html#a760de167b01d1a71e9f43dc1d3b8f2b6", null ], + [ "GTK_DATABOX_XYC_GRAPH_CLASS", "gtkdatabox__xyc__graph_8h.html#ac6adf390129f5dadd78492725f68945f", null ], + [ "GTK_DATABOX_XYC_GRAPH_GET_CLASS", "gtkdatabox__xyc__graph_8h.html#a409594c00439d600b6b50548e240b494", null ], + [ "GtkDataboxXYCGraph", "gtkdatabox__xyc__graph_8h.html#af5621a5025c9238de2bfc4b32e1d66af", null ], + [ "GtkDataboxXYCGraphClass", "gtkdatabox__xyc__graph_8h.html#a834d707d6bdfb4c29ab34fe2bfb62c32", null ], + [ "GtkDataboxXYCGraphPrivate", "gtkdatabox__xyc__graph_8h.html#aedf8faf6b4039e9693efd9c758fc179c", null ], + [ "gtk_databox_xyc_graph_get_length", "gtkdatabox__xyc__graph_8h.html#acac4c3dcc372b5ed36752042b8a900a1", null ], + [ "gtk_databox_xyc_graph_get_type", "gtkdatabox__xyc__graph_8h.html#a56d63dab090aeaf0f0de0735c73c37f3", null ], + [ "gtk_databox_xyc_graph_get_X", "gtkdatabox__xyc__graph_8h.html#a4e831838680eca0bd69585d2a9fb470e", null ], + [ "gtk_databox_xyc_graph_get_Y", "gtkdatabox__xyc__graph_8h.html#a07439806f7693c841ec1c81bfa0ca85a", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__dep__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__dep__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +c5173fa98493fa21f724c12034f6fa02 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +52cf7924a0526cdc0f061406098dfe73 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +fb3e2062a20dab3fe19d81a5c2f121fd \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_acac4c3dcc372b5ed36752042b8a900a1_icgraph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyc__graph_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyc__graph_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,195 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_xyc_graph.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_xyc_graph.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_xyc_graph.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  * 
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  * 
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00032 #ifndef __GTK_DATABOX_XYC_GRAPH_H__
+00033 #define __GTK_DATABOX_XYC_GRAPH_H__
+00034 
+00035 #include <gtkdatabox_graph.h>
+00036 
+00037 G_BEGIN_DECLS
+00038 #define GTK_DATABOX_TYPE_XYC_GRAPH                (gtk_databox_xyc_graph_get_type ())
+00039 #define GTK_DATABOX_XYC_GRAPH(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00040                                            GTK_DATABOX_TYPE_XYC_GRAPH, \
+00041                                            GtkDataboxXYCGraph))
+00042 #define GTK_DATABOX_XYC_GRAPH_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00043                                            GTK_DATABOX_TYPE_XYC_GRAPH, \
+00044                                            GtkDataboxXYCGraphClass))
+00045 #define GTK_DATABOX_IS_XYC_GRAPH(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00046                                            GTK_DATABOX_TYPE_XYC_GRAPH))
+00047 #define GTK_DATABOX_IS_XYC_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00048                                            GTK_DATABOX_TYPE_XYC_GRAPH))
+00049 #define GTK_DATABOX_XYC_GRAPH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00050                                            GTK_DATABOX_TYPE_XYC_GRAPH, \
+00051                                            GtkDataboxXYCGraphClass))
+00052 
+00061    typedef struct _GtkDataboxXYCGraph GtkDataboxXYCGraph;
+00062 
+00063    typedef struct _GtkDataboxXYCGraphClass GtkDataboxXYCGraphClass;
+00064 
+00072    typedef struct _GtkDataboxXYCGraphPrivate GtkDataboxXYCGraphPrivate;
+00073 
+00074    struct _GtkDataboxXYCGraph
+00075    {
+00076       /*< private >*/
+00077       GtkDataboxGraph parent;
+00078 
+00079       GtkDataboxXYCGraphPrivate *priv;
+00080    };
+00081 
+00082    struct _GtkDataboxXYCGraphClass
+00083    {
+00084       GtkDataboxGraphClass parent_class;
+00085    };
+00086 
+00087    GType gtk_databox_xyc_graph_get_type (void);
+00088 
+00089    guint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph * xyc_graph);
+00090    gfloat *gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph * xyc_graph);
+00091    gfloat *gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph * xyc_graph);
+00092 
+00093 G_END_DECLS
+00094 #endif                          /* __GTK_DATABOX_XYC_GRAPH_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,283 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_xyyc_graph.c File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Enumerations | +Functions
+
+
gtk/gtkdatabox_xyyc_graph.c File Reference
+
+
+
#include <gtkdatabox_xyyc_graph.h>
+
+Include dependency graph for gtkdatabox_xyyc_graph.c:
+
+
+ + +
+
+ + + + + + + + + + +

+Data Structures

struct  _GtkDataboxXYYCGraphPrivate

+Enumerations

enum  { PROP_X = 1, +PROP_Y1, +PROP_Y2, +PROP_LEN + }

+Functions

gfloat * gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph *xyyc_graph)
gfloat * gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph *xyyc_graph)
gfloat * gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph *xyyc_graph)
guint gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph *xyyc_graph)
GType gtk_databox_xyyc_graph_get_type (void)
+

Enumeration Type Documentation

+ +
+
+ + + + +
anonymous enum
+
+
+
Enumerator:
+ + + + +
PROP_X  +
PROP_Y1  +
PROP_Y2  +
PROP_LEN  +
+
+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
guint gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_length: : A GtkDataboxXYYCGraph object

+

Gets the the length of the X and Y values arrays.

+

Return value: Length of X/Y arrays.

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_xyyc_graph_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_X: : A GtkDataboxXYYCGraph object

+

Gets the X values of the .

+

Return value: Pointer to X values

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_Y1: : A GtkDataboxXYYCGraph object

+

Gets the Y1 values of the .

+

Return value: Pointer to Y1 values

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_Y2: : A GtkDataboxXYYCGraph object

+

Gets the Y2 values of the .

+

Return value: Pointer to Y2 values

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,19 @@ +var gtkdatabox__xyyc__graph_8c = +[ + [ "gtk_databox_xyyc_graph_class_init", "gtkdatabox__xyyc__graph_8c.html#a53e1f7f98bb318cbac36195d21b02df5", null ], + [ "gtk_databox_xyyc_graph_get_length", "gtkdatabox__xyyc__graph_8c.html#ac6c037e22d9db2f803424bb8ebdedd80", null ], + [ "gtk_databox_xyyc_graph_get_property", "gtkdatabox__xyyc__graph_8c.html#a0bdeaa251245e7bf7c6d367e45558742", null ], + [ "gtk_databox_xyyc_graph_get_type", "gtkdatabox__xyyc__graph_8c.html#a454493a1d622f6dd9733b77834be7bf9", null ], + [ "gtk_databox_xyyc_graph_get_X", "gtkdatabox__xyyc__graph_8c.html#ae2bc118675f13b526862e6a0b948b823", null ], + [ "gtk_databox_xyyc_graph_get_Y1", "gtkdatabox__xyyc__graph_8c.html#a5466189c0b1133449d6170cff60861c7", null ], + [ "gtk_databox_xyyc_graph_get_Y2", "gtkdatabox__xyyc__graph_8c.html#acd365407858e0c307ba20f9a3a7f08c2", null ], + [ "gtk_databox_xyyc_graph_instance_init", "gtkdatabox__xyyc__graph_8c.html#a39cb4fb1e3063b379a12c583ef463d6b", null ], + [ "gtk_databox_xyyc_graph_real_calculate_extrema", "gtkdatabox__xyyc__graph_8c.html#aad2f53d24e8f81c602790b9223d62924", null ], + [ "gtk_databox_xyyc_graph_set_length", "gtkdatabox__xyyc__graph_8c.html#aba070b42739d89945837fbe144282f28", null ], + [ "gtk_databox_xyyc_graph_set_property", "gtkdatabox__xyyc__graph_8c.html#aded8edb037ebc8fc6f765ffef25f31ae", null ], + [ "gtk_databox_xyyc_graph_set_X", "gtkdatabox__xyyc__graph_8c.html#a47d9c179611f5619839690c9440b5e76", null ], + [ "gtk_databox_xyyc_graph_set_Y1", "gtkdatabox__xyyc__graph_8c.html#ad32440023ca6b18ca26ceb9b0e31437a", null ], + [ "gtk_databox_xyyc_graph_set_Y2", "gtkdatabox__xyyc__graph_8c.html#a70b5e5bd17b047ef686e2a3a0d62d9e3", null ], + [ "xyyc_graph_finalize", "gtkdatabox__xyyc__graph_8c.html#afaec0153479a2f1ff96edf73395fa851", null ], + [ "parent_class", "gtkdatabox__xyyc__graph_8c.html#a15f594f5d1d2eab4b9c044d10ef93232", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +01ce9ca609ea54e037fedf6a36986121 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8c__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8c__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,434 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_xyyc_graph.h File Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Structures | +Defines | +Typedefs | +Functions
+
+
gtk/gtkdatabox_xyyc_graph.h File Reference
+
+
+
#include <gtkdatabox_graph.h>
+
+Include dependency graph for gtkdatabox_xyyc_graph.h:
+
+
+ + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + +

+Data Structures

struct  _GtkDataboxXYYCGraph
struct  _GtkDataboxXYYCGraphClass

+Defines

#define GTK_DATABOX_TYPE_XYYC_GRAPH   (gtk_databox_xyyc_graph_get_type ())
#define GTK_DATABOX_XYYC_GRAPH(obj)
#define GTK_DATABOX_XYYC_GRAPH_CLASS(klass)
#define GTK_DATABOX_IS_XYYC_GRAPH(obj)
#define GTK_DATABOX_IS_XYYC_GRAPH_CLASS(klass)
#define GTK_DATABOX_XYYC_GRAPH_GET_CLASS(obj)

+Typedefs

typedef struct _GtkDataboxXYYCGraph GtkDataboxXYYCGraph
typedef struct
+_GtkDataboxXYYCGraphClass 		GtkDataboxXYYCGraphClass
typedef struct
+_GtkDataboxXYYCGraphPrivate 		GtkDataboxXYYCGraphPrivate

+Functions

GType gtk_databox_xyyc_graph_get_type (void)
guint gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph *xyyc_graph)
gfloat * gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph *xyyc_graph)
gfloat * gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph *xyyc_graph)
gfloat * gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph *xyyc_graph)
+

Define Documentation

+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_XYYC_GRAPH( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                           GTK_DATABOX_TYPE_XYYC_GRAPH))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_IS_XYYC_GRAPH_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+                                           GTK_DATABOX_TYPE_XYYC_GRAPH))
+
+
+
+ +
+
+ + + + +
#define GTK_DATABOX_TYPE_XYYC_GRAPH   (gtk_databox_xyyc_graph_get_type ())
+
+
+

SECTION:gtkdatabox_xyyc_graph : An abstract anchestor for all graphs which display xyy-values (x, y1 and y2 values) in one color. gtkdatabox_xyyc_graph.h : GtkDatabox, GtkDataboxOffsetBars

+

GtkDataboxXYYCGraphs are an abstract class for displaying XYY-data (x, y1 and y2 values) in one color. The values for the data are represented as an array of X values, an array of Y1 values and an array of Y2 values. In order to actually display data, you should use one of the derived classes.

+ +
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_XYYC_GRAPH( obj)
+
+
+Value:
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                           GTK_DATABOX_TYPE_XYYC_GRAPH, \
+                                           GtkDataboxXYYCGraph))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_XYYC_GRAPH_CLASS( klass)
+
+
+Value:
(G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                           GTK_DATABOX_TYPE_XYYC_GRAPH, \
+                                           GtkDataboxXYYCGraphClass))
+
+
+
+ +
+
+ + + + + + + + +
#define GTK_DATABOX_XYYC_GRAPH_GET_CLASS( obj)
+
+
+Value:
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                           GTK_DATABOX_TYPE_XYYC_GRAPH, \
+                                           GtkDataboxXYYCGraphClass))
+
+
+
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct _GtkDataboxXYYCGraph GtkDataboxXYYCGraph
+
+
+

GtkDataboxXYYCGraph:

+

GtkDataboxXYYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented as an array of X values and a second array of Y values. In order to actually display data, you should use one of the derived classes.

+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxXYYCGraphClass GtkDataboxXYYCGraphClass
+
+
+ +
+
+ +
+
+ + + + +
typedef struct _GtkDataboxXYYCGraphPrivate GtkDataboxXYYCGraphPrivate
+
+
+

GtkDataboxXYYCGraphPrivate

+

A private data structure used by the GtkDataboxXYYCGraph. It shields all internal things from developers who are just using the object.

+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
guint gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_length: : A GtkDataboxXYYCGraph object

+

Gets the the length of the X and Y values arrays.

+

Return value: Length of X/Y arrays.

+ +
+
+ +
+
+ + + + + + + + +
GType gtk_databox_xyyc_graph_get_type (void )
+
+
+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_X: : A GtkDataboxXYYCGraph object

+

Gets the X values of the .

+

Return value: Pointer to X values

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_Y1: : A GtkDataboxXYYCGraph object

+

Gets the Y1 values of the .

+

Return value: Pointer to Y1 values

+ +
+
+ +
+
+ + + + + + + + +
gfloat* gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph * xyyc_graph)
+
+
+

gtk_databox_xyyc_graph_get_Y2: : A GtkDataboxXYYCGraph object

+

Gets the Y2 values of the .

+

Return value: Pointer to Y2 values

+ +
+
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h.js libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h.js --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,17 @@ +var gtkdatabox__xyyc__graph_8h = +[ + [ "GTK_DATABOX_IS_XYYC_GRAPH", "gtkdatabox__xyyc__graph_8h.html#a57e3d9c484900e43f2e0d01c7812dc9c", null ], + [ "GTK_DATABOX_IS_XYYC_GRAPH_CLASS", "gtkdatabox__xyyc__graph_8h.html#accc566edd2d13bc6722ab25d13e53f78", null ], + [ "GTK_DATABOX_TYPE_XYYC_GRAPH", "gtkdatabox__xyyc__graph_8h.html#ae31ed1cfa408d9c563b509989a4bce75", null ], + [ "GTK_DATABOX_XYYC_GRAPH", "gtkdatabox__xyyc__graph_8h.html#af4691fc2386aaf204de1d49e963aa6d4", null ], + [ "GTK_DATABOX_XYYC_GRAPH_CLASS", "gtkdatabox__xyyc__graph_8h.html#ad86dbb48ccc00618577844d44e477a93", null ], + [ "GTK_DATABOX_XYYC_GRAPH_GET_CLASS", "gtkdatabox__xyyc__graph_8h.html#a80248980cd179762a7058a25ecc3aefe", null ], + [ "GtkDataboxXYYCGraph", "gtkdatabox__xyyc__graph_8h.html#ab2df9d3e0e1de01124b9f75c5dc43668", null ], + [ "GtkDataboxXYYCGraphClass", "gtkdatabox__xyyc__graph_8h.html#af61cd85742fe3f91e2db1c1e8c3d04fd", null ], + [ "GtkDataboxXYYCGraphPrivate", "gtkdatabox__xyyc__graph_8h.html#a8cadf48d96e2acc5d9823fc15c9cfffa", null ], + [ "gtk_databox_xyyc_graph_get_length", "gtkdatabox__xyyc__graph_8h.html#ac6c037e22d9db2f803424bb8ebdedd80", null ], + [ "gtk_databox_xyyc_graph_get_type", "gtkdatabox__xyyc__graph_8h.html#a454493a1d622f6dd9733b77834be7bf9", null ], + [ "gtk_databox_xyyc_graph_get_X", "gtkdatabox__xyyc__graph_8h.html#ae2bc118675f13b526862e6a0b948b823", null ], + [ "gtk_databox_xyyc_graph_get_Y1", "gtkdatabox__xyyc__graph_8h.html#a5466189c0b1133449d6170cff60861c7", null ], + [ "gtk_databox_xyyc_graph_get_Y2", "gtkdatabox__xyyc__graph_8h.html#acd365407858e0c307ba20f9a3a7f08c2", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +1938c878906bc5c13a6ff4fbe7503526 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__dep__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__incl.map libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__incl.map --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__incl.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__incl.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__incl.md5 libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__incl.md5 --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__incl.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__incl.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +70b526c06d2fedb449c6fd5cf011fb67 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h__incl.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h__incl.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h_source.html libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h_source.html --- libgtkdatabox-0.9.1.1/api/html/gtkdatabox__xyyc__graph_8h_source.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/gtkdatabox__xyyc__graph_8h_source.html 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,196 @@ + + + + + +GtkDatabox: gtk/gtkdatabox_xyyc_graph.h Source File + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+
gtk/gtkdatabox_xyyc_graph.h
+
+
+Go to the documentation of this file.
00001 /* $Id: gtkdatabox_xyyc_graph.h 4 2008-06-22 09:19:11Z rbock $ */
+00002 /* GtkDatabox - An extension to the gtk+ library
+00003  * Copyright (C) 1998 - 2008  Dr. Roland Bock
+00004  *
+00005  * This program is free software; you can redistribute it and/or
+00006  * modify it under the terms of the GNU Lesser General Public License
+00007  * as published by the Free Software Foundation; either version 2.1
+00008  * of the License, or (at your option) any later version.
+00009  *
+00010  * This program is distributed in the hope that it will be useful,
+00011  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+00012  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+00013  * GNU Lesser General Public License for more details.
+00014  *
+00015  * You should have received a copy of the GNU General Public License
+00016  * along with this program; if not, write to the Free Software
+00017  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+00018  */
+00019 
+00032 #ifndef __GTK_DATABOX_XYYC_GRAPH_H__
+00033 #define __GTK_DATABOX_XYYC_GRAPH_H__
+00034 
+00035 #include <gtkdatabox_graph.h>
+00036 
+00037 G_BEGIN_DECLS
+00038 #define GTK_DATABOX_TYPE_XYYC_GRAPH               (gtk_databox_xyyc_graph_get_type ())
+00039 #define GTK_DATABOX_XYYC_GRAPH(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+00040                                            GTK_DATABOX_TYPE_XYYC_GRAPH, \
+00041                                            GtkDataboxXYYCGraph))
+00042 #define GTK_DATABOX_XYYC_GRAPH_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), \
+00043                                            GTK_DATABOX_TYPE_XYYC_GRAPH, \
+00044                                            GtkDataboxXYYCGraphClass))
+00045 #define GTK_DATABOX_IS_XYYC_GRAPH(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+00046                                            GTK_DATABOX_TYPE_XYYC_GRAPH))
+00047 #define GTK_DATABOX_IS_XYYC_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+00048                                            GTK_DATABOX_TYPE_XYYC_GRAPH))
+00049 #define GTK_DATABOX_XYYC_GRAPH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+00050                                            GTK_DATABOX_TYPE_XYYC_GRAPH, \
+00051                                            GtkDataboxXYYCGraphClass))
+00052 
+00061    typedef struct _GtkDataboxXYYCGraph GtkDataboxXYYCGraph;
+00062 
+00063    typedef struct _GtkDataboxXYYCGraphClass GtkDataboxXYYCGraphClass;
+00064 
+00072    typedef struct _GtkDataboxXYYCGraphPrivate GtkDataboxXYYCGraphPrivate;
+00073 
+00074    struct _GtkDataboxXYYCGraph
+00075    {
+00076       /*< private >*/
+00077       GtkDataboxGraph parent;
+00078 
+00079       GtkDataboxXYYCGraphPrivate *priv;
+00080    };
+00081 
+00082    struct _GtkDataboxXYYCGraphClass
+00083    {
+00084       GtkDataboxGraphClass parent_class;
+00085    };
+00086 
+00087    GType gtk_databox_xyyc_graph_get_type (void);
+00088 
+00089    guint gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph * xyyc_graph);
+00090    gfloat *gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph * xyyc_graph);
+00091    gfloat *gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph * xyyc_graph);
+00092    gfloat *gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph * xyyc_graph);
+00093 
+00094 G_END_DECLS
+00095 #endif                          /* __GTK_DATABOX_XYYC_GRAPH_H__ */
+
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/index.html libgtkdatabox-0.9.2.0/api/html/index.html --- libgtkdatabox-0.9.1.1/api/html/index.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/index.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + +GtkDatabox: Main Page + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + +
+
+ +
+
+
+ +
+
+
+
GtkDatabox Documentation
+
+
+
+ + + + +
+ +
+ +
+ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/installdox libgtkdatabox-0.9.2.0/api/html/installdox --- libgtkdatabox-0.9.1.1/api/html/installdox 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/installdox 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,112 @@ +#!/usr/bin/perl + +%subst = ( ); +$quiet = 0; + +while ( @ARGV ) { + $_ = shift @ARGV; + if ( s/^-// ) { + if ( /^l(.*)/ ) { + $v = ($1 eq "") ? shift @ARGV : $1; + ($v =~ /\/$/) || ($v .= "/"); + $_ = $v; + if ( /(.+)\@(.+)/ ) { + if ( exists $subst{$1} ) { + $subst{$1} = $2; + } else { + print STDERR "Unknown tag file $1 given with option -l\n"; + &usage(); + } + } else { + print STDERR "Argument $_ is invalid for option -l\n"; + &usage(); + } + } + elsif ( /^q/ ) { + $quiet = 1; + } + elsif ( /^\?|^h/ ) { + &usage(); + } + else { + print STDERR "Illegal option -$_\n"; + &usage(); + } + } + else { + push (@files, $_ ); + } +} + +foreach $sub (keys %subst) +{ + if ( $subst{$sub} eq "" ) + { + print STDERR "No substitute given for tag file `$sub'\n"; + &usage(); + } + elsif ( ! $quiet && $sub ne "_doc" && $sub ne "_cgi" ) + { + print "Substituting $subst{$sub} for each occurrence of tag file $sub\n"; + } +} + +if ( ! @files ) { + if (opendir(D,".")) { + foreach $file ( readdir(D) ) { + $match = ".html"; + next if ( $file =~ /^\.\.?$/ ); + ($file =~ /$match/) && (push @files, $file); + ($file =~ /\.svg/) && (push @files, $file); + ($file =~ "navtree.js") && (push @files, $file); + } + closedir(D); + } +} + +if ( ! @files ) { + print STDERR "Warning: No input files given and none found!\n"; +} + +foreach $f (@files) +{ + if ( ! $quiet ) { + print "Editing: $f...\n"; + } + $oldf = $f; + $f .= ".bak"; + unless (rename $oldf,$f) { + print STDERR "Error: cannot rename file $oldf\n"; + exit 1; + } + if (open(F,"<$f")) { + unless (open(G,">$oldf")) { + print STDERR "Error: opening file $oldf for writing\n"; + exit 1; + } + if ($oldf ne "tree.js") { + while () { + s/doxygen\=\"([^ \"\:\t\>\<]*)\:([^ \"\t\>\<]*)\" (xlink:href|href|src)=\"\2/doxygen\=\"$1:$subst{$1}\" \3=\"$subst{$1}/g; + print G "$_"; + } + } + else { + while () { + s/\"([^ \"\:\t\>\<]*)\:([^ \"\t\>\<]*)\", \"\2/\"$1:$subst{$1}\" ,\"$subst{$1}/g; + print G "$_"; + } + } + } + else { + print STDERR "Warning file $f does not exist\n"; + } + unlink $f; +} + +sub usage { + print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n"; + print STDERR "Options:\n"; + print STDERR " -l tagfile\@linkName tag file + URL or directory \n"; + print STDERR " -q Quiet mode\n\n"; + exit 1; +} diff -Nru libgtkdatabox-0.9.1.1/api/html/jquery.js libgtkdatabox-0.9.2.0/api/html/jquery.js --- libgtkdatabox-0.9.1.1/api/html/jquery.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/jquery.js 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,110 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); +/* + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0) +{I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function() +{G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); + +/* + * jQuery hashchange event - v1.3 - 7/21/2010 + * http://benalman.com/projects/jquery-hashchange-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + */ +(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$(' +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/structGtkDataboxMarkersInfo.js libgtkdatabox-0.9.2.0/api/html/structGtkDataboxMarkersInfo.js --- libgtkdatabox-0.9.1.1/api/html/structGtkDataboxMarkersInfo.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/structGtkDataboxMarkersInfo.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,8 @@ +var structGtkDataboxMarkersInfo = +[ + [ "boxed", "structGtkDataboxMarkersInfo.html#a6fe09384d033dc8fa948d46b71a5aead", null ], + [ "label", "structGtkDataboxMarkersInfo.html#a65a00a658d250d78d4692a7cb764af0c", null ], + [ "label_position", "structGtkDataboxMarkersInfo.html#aba789efd627e25d24196b73659843cf4", null ], + [ "position", "structGtkDataboxMarkersInfo.html#a3daa0b7a0d2f2a26805e7b58b87b8313", null ], + [ "text", "structGtkDataboxMarkersInfo.html#aa2301c575b9a06f49fadd2f835354274", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/structGtkDataboxValueRectangle.html libgtkdatabox-0.9.2.0/api/html/structGtkDataboxValueRectangle.html --- libgtkdatabox-0.9.1.1/api/html/structGtkDataboxValueRectangle.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/structGtkDataboxValueRectangle.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,197 @@ + + + + + +GtkDatabox: GtkDataboxValueRectangle Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
GtkDataboxValueRectangle Struct Reference
+
+
+ +

#include <gtkdatabox.h>

+ + + + + + +

+Data Fields

gfloat x1
gfloat x2
gfloat y1
gfloat y2
+

Field Documentation

+ +
+
+ + + + +
gfloat x1
+
+
+ +
+
+ +
+
+ + + + +
gfloat x2
+
+
+ +
+
+ +
+
+ + + + +
gfloat y1
+
+
+ +
+
+ +
+
+ + + + +
gfloat y2
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/structGtkDataboxValueRectangle.js libgtkdatabox-0.9.2.0/api/html/structGtkDataboxValueRectangle.js --- libgtkdatabox-0.9.1.1/api/html/structGtkDataboxValueRectangle.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/structGtkDataboxValueRectangle.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,7 @@ +var structGtkDataboxValueRectangle = +[ + [ "x1", "structGtkDataboxValueRectangle.html#ad82dbfbd873db3ab5bd6ec7da3eae393", null ], + [ "x2", "structGtkDataboxValueRectangle.html#a59728dd85695d9e206d667b911bd521e", null ], + [ "y1", "structGtkDataboxValueRectangle.html#a32c4ebb2e5db814e9bf00d9d89e25aa3", null ], + [ "y2", "structGtkDataboxValueRectangle.html#ae1dea0f690727e8c6f8cdef9d250fd79", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,179 @@ + + + + + +GtkDatabox: _GtkDatabox Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDatabox Struct Reference
+
+
+ +

#include <gtkdatabox.h>

+
+Collaboration diagram for _GtkDatabox:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkWidget box
GtkDataboxPrivate * priv
+

Detailed Description

+

_GtkDatabox : The parent object : A private structure containing internal data.

+

Implementation of GtkDatabox.

+

Field Documentation

+ +
+
+ + + + +
GtkWidget box
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDatabox = +[ + [ "box", "struct__GtkDatabox.html#a5256f7207d919b77527c30ff43b4383d", null ], + [ "priv", "struct__GtkDatabox.html#a609545a5f5163d28e1e8d7a3edce7091", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxBars Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxBars Struct Reference
+
+
+ +

#include <gtkdatabox_bars.h>

+
+Collaboration diagram for _GtkDataboxBars:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxXYCGraph parent
GtkDataboxBarsPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxBarsPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxBars = +[ + [ "parent", "struct__GtkDataboxBars.html#a46d32b4b5b9bedbe476d5b5540163d67", null ], + [ "priv", "struct__GtkDataboxBars.html#ade81316ccf0cb60a633a081693c588ea", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxBarsClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxBarsClass Struct Reference
+
+
+ +

#include <gtkdatabox_bars.h>

+
+Collaboration diagram for _GtkDataboxBarsClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxXYCGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxBarsClass = +[ + [ "parent_class", "struct__GtkDataboxBarsClass.html#a24b80218e419b61868bdf6fb339a1b50", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +4566896faec773f7ceceec318487f8e0 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + +GtkDatabox: _GtkDataboxBarsPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxBarsPrivate Struct Reference
+
+
+ + + +

+Data Fields

GdkSegment * data
+

Field Documentation

+ +
+
+ + + + +
GdkSegment* data
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBarsPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBarsPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxBarsPrivate = +[ + [ "data", "struct__GtkDataboxBarsPrivate.html#a3a184321a059c9816b4d6d728efa22dd", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +6abb936194b071bd428423536141d9e4 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxBars__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxBars__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxClass.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,225 @@ + + + + + +GtkDatabox: _GtkDataboxClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxClass Struct Reference
+
+
+ +

#include <gtkdatabox.h>

+ + + + + + + + +

+Data Fields

GtkWidgetClass parent_class
void(* zoomed )(GtkDatabox *box)
void(* selection_started )(GtkDatabox *box, GtkDataboxValueRectangle *selectionValues)
void(* selection_changed )(GtkDatabox *box, GtkDataboxValueRectangle *selectionValues)
void(* selection_finalized )(GtkDatabox *box, GtkDataboxValueRectangle *selectionValues)
void(* selection_canceled )(GtkDatabox *box)
+

Field Documentation

+ +
+
+ + + + +
GtkWidgetClass parent_class
+
+
+ +
+
+ +
+
+ + + + +
void(* selection_canceled)(GtkDatabox *box)
+
+
+ +
+
+ +
+
+ + + + +
void(* selection_changed)(GtkDatabox *box, GtkDataboxValueRectangle *selectionValues)
+
+
+ +
+
+ +
+
+ + + + +
void(* selection_finalized)(GtkDatabox *box, GtkDataboxValueRectangle *selectionValues)
+
+
+ +
+
+ +
+
+ + + + +
void(* selection_started)(GtkDatabox *box, GtkDataboxValueRectangle *selectionValues)
+
+
+ +
+
+ +
+
+ + + + +
void(* zoomed)(GtkDatabox *box)
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,9 @@ +var struct__GtkDataboxClass = +[ + [ "parent_class", "struct__GtkDataboxClass.html#a0b454b1855201af3514a5c6f162bc620", null ], + [ "selection_canceled", "struct__GtkDataboxClass.html#a5ac72bfe44c7593dd5650bc9e69834c9", null ], + [ "selection_changed", "struct__GtkDataboxClass.html#af130e48281bd9c7f297c771e150b26af", null ], + [ "selection_finalized", "struct__GtkDataboxClass.html#adb9548510c69c4dbef9af9e835ca4d26", null ], + [ "selection_started", "struct__GtkDataboxClass.html#a3cb44ac77f7b687ae4c105c3113d4ee4", null ], + [ "zoomed", "struct__GtkDataboxClass.html#a4bd2d8126ba354b06bdda427acdbe3d6", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxCrossSimple Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxCrossSimple Struct Reference
+
+
+ +

#include <gtkdatabox_cross_simple.h>

+
+Collaboration diagram for _GtkDataboxCrossSimple:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxMarkers parent
GtkDataboxCrossSimplePrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxMarkers parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxCrossSimplePrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxCrossSimple = +[ + [ "parent", "struct__GtkDataboxCrossSimple.html#a5b19529b16f91d7b3d4bafd0ffa8d27f", null ], + [ "priv", "struct__GtkDataboxCrossSimple.html#af609a55af48c766a38bb21273f66a3e7", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxCrossSimpleClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxCrossSimpleClass Struct Reference
+
+
+ +

#include <gtkdatabox_cross_simple.h>

+
+Collaboration diagram for _GtkDataboxCrossSimpleClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxMarkersClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxMarkersClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxCrossSimpleClass = +[ + [ "parent_class", "struct__GtkDataboxCrossSimpleClass.html#a4e64c05d2795ba0b99c8c17a14d6b560", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +319cba8df26dbe3a88db86b18a0d92da \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimpleClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +d8536b8b333031bd5c0212e390aba102 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxCrossSimple__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxCrossSimple__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,179 @@ + + + + + +GtkDatabox: _GtkDataboxGraph Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxGraph Struct Reference
+
+
+ +

#include <gtkdatabox_graph.h>

+
+Collaboration diagram for _GtkDataboxGraph:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GObject parent
GtkDataboxGraphPrivate * priv
+

Detailed Description

+

_GtkDataboxGraph : The parent object : A private structure containing internal data.

+

Implementation of GtkDataboxGraph

+

Field Documentation

+ +
+
+ + + + +
GObject parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxGraphPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxGraph = +[ + [ "parent", "struct__GtkDataboxGraph.html#a119e262dd6f86f1488d00a7ce2d28abf", null ], + [ "priv", "struct__GtkDataboxGraph.html#a921506ac5f78bee30af41fc085ab4e36", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphClass.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,197 @@ + + + + + +GtkDatabox: _GtkDataboxGraphClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxGraphClass Struct Reference
+
+
+ +

#include <gtkdatabox_graph.h>

+ + + + + + +

+Data Fields

GObjectClass parent_class
void(* draw )(GtkDataboxGraph *graph, GtkDatabox *box)
gint(* calculate_extrema )(GtkDataboxGraph *graph, gfloat *min_x, gfloat *max_x, gfloat *min_y, gfloat *max_y)
GdkGC *(* create_gc )(GtkDataboxGraph *graph, GtkDatabox *box)
+

Field Documentation

+ +
+
+ + + + +
gint(* calculate_extrema)(GtkDataboxGraph *graph, gfloat *min_x, gfloat *max_x, gfloat *min_y, gfloat *max_y)
+
+
+ +
+
+ +
+
+ + + + +
GdkGC*(* create_gc)(GtkDataboxGraph *graph, GtkDatabox *box)
+
+
+ +
+
+ +
+
+ + + + +
void(* draw)(GtkDataboxGraph *graph, GtkDatabox *box)
+
+
+ +
+
+ +
+
+ + + + +
GObjectClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,7 @@ +var struct__GtkDataboxGraphClass = +[ + [ "calculate_extrema", "struct__GtkDataboxGraphClass.html#a888f8df97d509968b7ccf9d67b66849e", null ], + [ "create_gc", "struct__GtkDataboxGraphClass.html#a32d81233b3dc9ef39d856b5bcaaad9bb", null ], + [ "draw", "struct__GtkDataboxGraphClass.html#a28b5d11b6f0cae5511262000ffafd913", null ], + [ "parent_class", "struct__GtkDataboxGraphClass.html#af6eccf80858ff5e5b9385f80ccdefa7c", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,195 @@ + + + + + +GtkDatabox: _GtkDataboxGraphPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxGraphPrivate Struct Reference
+
+
+ + + + + + +

+Data Fields

GdkColor color
gint size
gboolean hide
GdkGC * gc
+

Field Documentation

+ +
+
+ + + + +
GdkColor color
+
+
+ +
+
+ +
+
+ + + + +
GdkGC* gc
+
+
+ +
+
+ +
+
+ + + + +
gboolean hide
+
+
+ +
+
+ +
+
+ + + + +
gint size
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraphPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraphPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,7 @@ +var struct__GtkDataboxGraphPrivate = +[ + [ "color", "struct__GtkDataboxGraphPrivate.html#abde185e4bd246ac3fd9a63681f258be9", null ], + [ "gc", "struct__GtkDataboxGraphPrivate.html#a311add490edc6fe85b1fd0cdf691bccf", null ], + [ "hide", "struct__GtkDataboxGraphPrivate.html#aa5f58d8a8a443973bab97a5ae8dfb653", null ], + [ "size", "struct__GtkDataboxGraphPrivate.html#a5ac9da3169a3b9e0fa4ccdfd5e12ab9c", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +ad1822e82d3556d1e6dd56cdd391054a \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGraph__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGraph__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxGrid Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxGrid Struct Reference
+
+
+ +

#include <gtkdatabox_grid.h>

+
+Collaboration diagram for _GtkDataboxGrid:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxGraph parent
GtkDataboxGridPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxGridPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxGrid = +[ + [ "parent", "struct__GtkDataboxGrid.html#a28801d3e2bdb16c814c7b604cf77a5bc", null ], + [ "priv", "struct__GtkDataboxGrid.html#a79ddf1749490eadf4f950f8e7dd412be", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxGridClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxGridClass Struct Reference
+
+
+ +

#include <gtkdatabox_grid.h>

+
+Collaboration diagram for _GtkDataboxGridClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxGridClass = +[ + [ "parent_class", "struct__GtkDataboxGridClass.html#ad1a932cb978a73127c4f92f5a885fcc0", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +9a428961af72b472b4cbfce57b2796c7 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,195 @@ + + + + + +GtkDatabox: _GtkDataboxGridPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxGridPrivate Struct Reference
+
+
+ + + + + + +

+Data Fields

gint hlines
gint vlines
gfloat * hline_vals
gfloat * vline_vals
+

Field Documentation

+ +
+
+ + + + +
gfloat* hline_vals
+
+
+ +
+
+ +
+
+ + + + +
gint hlines
+
+
+ +
+
+ +
+
+ + + + +
gfloat* vline_vals
+
+
+ +
+
+ +
+
+ + + + +
gint vlines
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGridPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGridPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,7 @@ +var struct__GtkDataboxGridPrivate = +[ + [ "hline_vals", "struct__GtkDataboxGridPrivate.html#a9fb31b9079cff62c48c8afeabee834cc", null ], + [ "hlines", "struct__GtkDataboxGridPrivate.html#a4fb07a2907c79b46c494cd1686153029", null ], + [ "vline_vals", "struct__GtkDataboxGridPrivate.html#ab6adce460b431af8d811b331ecd18dd2", null ], + [ "vlines", "struct__GtkDataboxGridPrivate.html#a1968f5efd60d8e39cad282293395a762", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +a0540c51249f74f163515b202ed799a1 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxGrid__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxGrid__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxLines Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxLines Struct Reference
+
+
+ +

#include <gtkdatabox_lines.h>

+
+Collaboration diagram for _GtkDataboxLines:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxXYCGraph parent
GtkDataboxLinesPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxLinesPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxLines = +[ + [ "parent", "struct__GtkDataboxLines.html#a46d32b4b5b9bedbe476d5b5540163d67", null ], + [ "priv", "struct__GtkDataboxLines.html#ae8712441ab6a7023ab0a9662fd980452", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxLinesClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxLinesClass Struct Reference
+
+
+ +

#include <gtkdatabox_lines.h>

+
+Collaboration diagram for _GtkDataboxLinesClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxXYCGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxLinesClass = +[ + [ "parent_class", "struct__GtkDataboxLinesClass.html#a24b80218e419b61868bdf6fb339a1b50", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +877f1bfb6de88417d95e7359dea80eea \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + +GtkDatabox: _GtkDataboxLinesPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxLinesPrivate Struct Reference
+
+
+ + + +

+Data Fields

GdkPoint * data
+

Field Documentation

+ +
+
+ + + + +
GdkPoint* data
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLinesPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLinesPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxLinesPrivate = +[ + [ "data", "struct__GtkDataboxLinesPrivate.html#ab004b1304534e4db33f3ff563826b462", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +48e5bce99daf4d9d58e49973fbfa3dd5 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxLines__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxLines__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxMarkers Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxMarkers Struct Reference
+
+
+ +

#include <gtkdatabox_markers.h>

+
+Collaboration diagram for _GtkDataboxMarkers:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxXYCGraph parent
GtkDataboxMarkersPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxMarkersPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxMarkers = +[ + [ "parent", "struct__GtkDataboxMarkers.html#a46d32b4b5b9bedbe476d5b5540163d67", null ], + [ "priv", "struct__GtkDataboxMarkers.html#a8ee76ca02379cd3bc67b3c1f01d7a2d3", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxMarkersClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxMarkersClass Struct Reference
+
+
+ +

#include <gtkdatabox_markers.h>

+
+Collaboration diagram for _GtkDataboxMarkersClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxXYCGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxMarkersClass = +[ + [ "parent_class", "struct__GtkDataboxMarkersClass.html#a24b80218e419b61868bdf6fb339a1b50", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +a722509880edf0b42aa00fe985d44c09 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,188 @@ + + + + + +GtkDatabox: _GtkDataboxMarkersPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxMarkersPrivate Struct Reference
+
+
+
+Collaboration diagram for _GtkDataboxMarkersPrivate:
+
+
Collaboration graph
+ + +
[legend]
+ + + + + +

+Data Fields

GtkDataboxMarkersType type
GtkDataboxMarkersInfo * markers_info
GdkGC * label_gc
+

Field Documentation

+ +
+
+ + + + +
GdkGC* label_gc
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxMarkersInfo* markers_info
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxMarkersType type
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,6 @@ +var struct__GtkDataboxMarkersPrivate = +[ + [ "label_gc", "struct__GtkDataboxMarkersPrivate.html#a72c32dc30c69462419f810f8bd8ae943", null ], + [ "markers_info", "struct__GtkDataboxMarkersPrivate.html#a4081c15832958e9836cd116a5b0108c9", null ], + [ "type", "struct__GtkDataboxMarkersPrivate.html#a6f75facb83e7847256e430b1b4ee1d1b", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +1e7efa9f87a7aaccb720bcba9b89cb55 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkersPrivate__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +452728523a9352e0eb640548eb2e3caa \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxMarkers__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxMarkers__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxOffsetBars Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxOffsetBars Struct Reference
+
+
+ +

#include <gtkdatabox_offset_bars.h>

+
+Collaboration diagram for _GtkDataboxOffsetBars:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxXYYCGraph parent
GtkDataboxOffsetBarsPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYYCGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxOffsetBarsPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxOffsetBars = +[ + [ "parent", "struct__GtkDataboxOffsetBars.html#ae2b6deeda9fd862edc82f2ac8e7c037f", null ], + [ "priv", "struct__GtkDataboxOffsetBars.html#a3ab1e70796519e702372221c476a9fe3", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxOffsetBarsClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxOffsetBarsClass Struct Reference
+
+
+ +

#include <gtkdatabox_offset_bars.h>

+
+Collaboration diagram for _GtkDataboxOffsetBarsClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxXYYCGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYYCGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxOffsetBarsClass = +[ + [ "parent_class", "struct__GtkDataboxOffsetBarsClass.html#a21518f033d4f637ffc55e5c2f7cda864", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +7facf748da1edbab6f895448aed13f9c \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + +GtkDatabox: _GtkDataboxOffsetBarsPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxOffsetBarsPrivate Struct Reference
+
+
+ + + +

+Data Fields

GdkSegment * data
+

Field Documentation

+ +
+
+ + + + +
GdkSegment* data
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBarsPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBarsPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxOffsetBarsPrivate = +[ + [ "data", "struct__GtkDataboxOffsetBarsPrivate.html#a3a184321a059c9816b4d6d728efa22dd", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +5c9efe1292b77dadd307f89b76cec942 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxOffsetBars__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxOffsetBars__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxPoints Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxPoints Struct Reference
+
+
+ +

#include <gtkdatabox_points.h>

+
+Collaboration diagram for _GtkDataboxPoints:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxXYCGraph parent
GtkDataboxPointsPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxPointsPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxPoints = +[ + [ "parent", "struct__GtkDataboxPoints.html#a46d32b4b5b9bedbe476d5b5540163d67", null ], + [ "priv", "struct__GtkDataboxPoints.html#a07fa0753e1eac498688dac62f2768250", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxPointsClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxPointsClass Struct Reference
+
+
+ +

#include <gtkdatabox_points.h>

+
+Collaboration diagram for _GtkDataboxPointsClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxXYCGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYCGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxPointsClass = +[ + [ "parent_class", "struct__GtkDataboxPointsClass.html#a24b80218e419b61868bdf6fb339a1b50", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +cb508e60a3c7902099a4abf4dfdffe0f \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + +GtkDatabox: _GtkDataboxPointsPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxPointsPrivate Struct Reference
+
+
+ + + +

+Data Fields

GdkPoint * data
+

Field Documentation

+ +
+
+ + + + +
GdkPoint* data
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPointsPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPointsPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxPointsPrivate = +[ + [ "data", "struct__GtkDataboxPointsPrivate.html#ab004b1304534e4db33f3ff563826b462", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +358b41e49f83b36343592ca3d41aba67 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPoints__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPoints__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,538 @@ + + + + + +GtkDatabox: _GtkDataboxPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxPrivate Struct Reference
+
+
+
+Collaboration diagram for _GtkDataboxPrivate:
+
+
Collaboration graph
+ + +
[legend]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Fields

GdkPixmap * backing_pixmap
gfloat total_left
gfloat total_right
gfloat total_top
gfloat total_bottom
gfloat visible_left
gfloat visible_right
gfloat visible_top
gfloat visible_bottom
GtkDataboxScaleType scale_type_x
GtkDataboxScaleType scale_type_y
gfloat translation_factor_x
gfloat translation_factor_y
gboolean enable_selection
gboolean enable_zoom
GtkAdjustment * adj_x
GtkAdjustment * adj_y
GtkDataboxRuler * ruler_x
GtkDataboxRuler * ruler_y
GList * graphs
GdkGC * select_gc
GdkPoint marked
GdkPoint select
GtkDataboxValueRectangle selectionValues
gfloat zoom_limit
gboolean selection_active
gboolean selection_finalized
GtkShadowType box_shadow
+

Field Documentation

+ +
+
+ + + + +
GtkAdjustment* adj_x
+
+
+ +
+
+ +
+
+ + + + +
GtkAdjustment* adj_y
+
+
+ +
+
+ +
+
+ + + + +
GdkPixmap* backing_pixmap
+
+
+ +
+
+ +
+
+ + + + +
GtkShadowType box_shadow
+
+
+ +
+
+ +
+
+ + + + +
gboolean enable_selection
+
+
+ +
+
+ +
+
+ + + + +
gboolean enable_zoom
+
+
+ +
+
+ +
+
+ + + + +
GList* graphs
+
+
+ +
+
+ +
+
+ + + + +
GdkPoint marked
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxRuler* ruler_x
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxRuler* ruler_y
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxScaleType scale_type_x
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxScaleType scale_type_y
+
+
+ +
+
+ +
+
+ + + + +
GdkPoint select
+
+
+ +
+
+ +
+
+ + + + +
GdkGC* select_gc
+
+
+ +
+
+ +
+
+ + + + +
gboolean selection_active
+
+
+ +
+
+ +
+
+ + + + +
gboolean selection_finalized
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxValueRectangle selectionValues
+
+
+ +
+
+ +
+
+ + + + +
gfloat total_bottom
+
+
+ +
+
+ +
+
+ + + + +
gfloat total_left
+
+
+ +
+
+ +
+
+ + + + +
gfloat total_right
+
+
+ +
+
+ +
+
+ + + + +
gfloat total_top
+
+
+ +
+
+ +
+
+ + + + +
gfloat translation_factor_x
+
+
+ +
+
+ +
+
+ + + + +
gfloat translation_factor_y
+
+
+ +
+
+ +
+
+ + + + +
gfloat visible_bottom
+
+
+ +
+
+ +
+
+ + + + +
gfloat visible_left
+
+
+ +
+
+ +
+
+ + + + +
gfloat visible_right
+
+
+ +
+
+ +
+
+ + + + +
gfloat visible_top
+
+
+ +
+
+ +
+
+ + + + +
gfloat zoom_limit
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,31 @@ +var struct__GtkDataboxPrivate = +[ + [ "adj_x", "struct__GtkDataboxPrivate.html#aed505d3a0c8f98b89106026017852f39", null ], + [ "adj_y", "struct__GtkDataboxPrivate.html#afa41b8fc084c168150b622011ad25516", null ], + [ "backing_pixmap", "struct__GtkDataboxPrivate.html#ab8ca0bfaddc5fd8964fc622854a9edc4", null ], + [ "box_shadow", "struct__GtkDataboxPrivate.html#a9c58f43d44f6aeab2e79a4f6447868d5", null ], + [ "enable_selection", "struct__GtkDataboxPrivate.html#aba9846810b8d22d7608416ebbe1cde42", null ], + [ "enable_zoom", "struct__GtkDataboxPrivate.html#a24aab6575492f20a1a0e73cba1979a91", null ], + [ "graphs", "struct__GtkDataboxPrivate.html#a3b6f5af94a114741c90f94f07f1fe744", null ], + [ "marked", "struct__GtkDataboxPrivate.html#a95c21917223ddb1046cda4acbddcef1a", null ], + [ "ruler_x", "struct__GtkDataboxPrivate.html#a4af9210d568b6e22e3416b7d3c083637", null ], + [ "ruler_y", "struct__GtkDataboxPrivate.html#a9dd06f5a081cd4fa52931faca99983fd", null ], + [ "scale_type_x", "struct__GtkDataboxPrivate.html#a0d31950e41c5689fdc0f5e912fdc7527", null ], + [ "scale_type_y", "struct__GtkDataboxPrivate.html#ab0e4b3eb59c8a3fbd07135e18e4aed89", null ], + [ "select", "struct__GtkDataboxPrivate.html#a877ec399f84e4e6a62b19fb5396722a7", null ], + [ "select_gc", "struct__GtkDataboxPrivate.html#a35391ae987cbb96ebaf9fc8176f2b32a", null ], + [ "selection_active", "struct__GtkDataboxPrivate.html#ac2f202407188a5ee9c348e87e9456d24", null ], + [ "selection_finalized", "struct__GtkDataboxPrivate.html#ac81daea50fd6243c6e6ce30df906cd09", null ], + [ "selectionValues", "struct__GtkDataboxPrivate.html#ab467b187a9c7af9f4e5fa97829c8900c", null ], + [ "total_bottom", "struct__GtkDataboxPrivate.html#aa33ac03a2009f82aa6715e38dacb2910", null ], + [ "total_left", "struct__GtkDataboxPrivate.html#a2a130156660fb9cde73c6bc556db547a", null ], + [ "total_right", "struct__GtkDataboxPrivate.html#a5a3861b332c75ca1545d4df3168e5887", null ], + [ "total_top", "struct__GtkDataboxPrivate.html#a82ffa4e0ed6962ca1da3abcaf1ba8ee6", null ], + [ "translation_factor_x", "struct__GtkDataboxPrivate.html#aeb0ccbd5c42069a54d355950ff4c4d3c", null ], + [ "translation_factor_y", "struct__GtkDataboxPrivate.html#a6029147d97b12f40c2b7addb74095318", null ], + [ "visible_bottom", "struct__GtkDataboxPrivate.html#a629bfbebcebe9b2b8f82064cd6e28d7d", null ], + [ "visible_left", "struct__GtkDataboxPrivate.html#a2463646083d1f55a5a17338fe68ab210", null ], + [ "visible_right", "struct__GtkDataboxPrivate.html#a9982264a5d5427ef04ccbef47e2b627f", null ], + [ "visible_top", "struct__GtkDataboxPrivate.html#a381da84a7f3a68dfb11d87a152bf6318", null ], + [ "zoom_limit", "struct__GtkDataboxPrivate.html#a86f5149c082d91fa506a04372a2fd85d", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +960f43aa0c4a5ff1f4eb20d8942a832c \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxPrivate__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxPrivate__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxRegions Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxRegions Struct Reference
+
+
+ +

#include <gtkdatabox_regions.h>

+
+Collaboration diagram for _GtkDataboxRegions:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxXYYCGraph parent
GtkDataboxRegionsPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYYCGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxRegionsPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxRegions = +[ + [ "parent", "struct__GtkDataboxRegions.html#ae2b6deeda9fd862edc82f2ac8e7c037f", null ], + [ "priv", "struct__GtkDataboxRegions.html#aef7a0af03723675ef3cf33ba652330cf", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxRegionsClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxRegionsClass Struct Reference
+
+
+ +

#include <gtkdatabox_regions.h>

+
+Collaboration diagram for _GtkDataboxRegionsClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxXYYCGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxXYYCGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxRegionsClass = +[ + [ "parent_class", "struct__GtkDataboxRegionsClass.html#a21518f033d4f637ffc55e5c2f7cda864", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,4 @@ + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +b38f200213989bbb5dab7675db92c920 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + +GtkDatabox: _GtkDataboxRegionsPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxRegionsPrivate Struct Reference
+
+
+ + + +

+Data Fields

GdkPoint * data
+

Field Documentation

+ +
+
+ + + + +
GdkPoint* data
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegionsPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegionsPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxRegionsPrivate = +[ + [ "data", "struct__GtkDataboxRegionsPrivate.html#ab004b1304534e4db33f3ff563826b462", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +97155c882be4edede1b8d8c46754cf2b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRegions__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRegions__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxRuler Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxRuler Struct Reference
+
+
+ +

#include <gtkdatabox_ruler.h>

+
+Collaboration diagram for _GtkDataboxRuler:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkWidget widget
GtkDataboxRulerPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxRulerPrivate* priv
+
+
+ +
+
+ +
+
+ + + + +
GtkWidget widget
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxRuler = +[ + [ "priv", "struct__GtkDataboxRuler.html#a75a5cd13890e644760764c92fa121e76", null ], + [ "widget", "struct__GtkDataboxRuler.html#a903bef3bd1ae58d9a0983b722a105aac", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerClass.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + +GtkDatabox: _GtkDataboxRulerClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxRulerClass Struct Reference
+
+
+ +

#include <gtkdatabox_ruler.h>

+ + + +

+Data Fields

GtkWidgetClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkWidgetClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxRulerClass = +[ + [ "parent_class", "struct__GtkDataboxRulerClass.html#a0b454b1855201af3514a5c6f162bc620", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,475 @@ + + + + + +GtkDatabox: _GtkDataboxRulerPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxRulerPrivate Struct Reference
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +

+Data Fields

GdkPixmap * backing_pixmap
gint xsrc
gint ysrc
gdouble lower
gdouble upper
gdouble position
gboolean draw_position
guint max_length
GtkDataboxScaleType scale_type
GtkOrientation orientation
GtkOrientation text_orientation
PangoAlignment text_alignment
gint text_hoffset
gint max_x_text_height
gint max_y_text_width
gboolean draw_ticks
gboolean draw_subticks
gboolean invert_edge
gchar linear_format [FORMAT_LENGTH]
gchar log_format [FORMAT_LENGTH]
gfloat * manual_ticks
guint manual_tick_cnt
gchar ** manual_tick_labels
GtkShadowType box_shadow
+

Field Documentation

+ +
+
+ + + + +
GdkPixmap* backing_pixmap
+
+
+ +
+
+ +
+
+ + + + +
GtkShadowType box_shadow
+
+
+ +
+
+ +
+
+ + + + +
gboolean draw_position
+
+
+ +
+
+ +
+
+ + + + +
gboolean draw_subticks
+
+
+ +
+
+ +
+
+ + + + +
gboolean draw_ticks
+
+
+ +
+
+ +
+
+ + + + +
gboolean invert_edge
+
+
+ +
+
+ +
+
+ + + + +
gchar linear_format[FORMAT_LENGTH]
+
+
+ +
+
+ +
+
+ + + + +
gchar log_format[FORMAT_LENGTH]
+
+
+ +
+
+ +
+
+ + + + +
gdouble lower
+
+
+ +
+
+ +
+
+ + + + +
guint manual_tick_cnt
+
+
+ +
+
+ +
+
+ + + + +
gchar** manual_tick_labels
+
+
+ +
+
+ +
+
+ + + + +
gfloat* manual_ticks
+
+
+ +
+
+ +
+
+ + + + +
guint max_length
+
+
+ +
+
+ +
+
+ + + + +
gint max_x_text_height
+
+
+ +
+
+ +
+
+ + + + +
gint max_y_text_width
+
+
+ +
+
+ +
+
+ + + + +
GtkOrientation orientation
+
+
+ +
+
+ +
+
+ + + + +
gdouble position
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxScaleType scale_type
+
+
+ +
+
+ +
+
+ + + + +
PangoAlignment text_alignment
+
+
+ +
+
+ +
+
+ + + + +
gint text_hoffset
+
+
+ +
+
+ +
+
+ + + + +
GtkOrientation text_orientation
+
+
+ +
+
+ +
+
+ + + + +
gdouble upper
+
+
+ +
+
+ +
+
+ + + + +
gint xsrc
+
+
+ +
+
+ +
+
+ + + + +
gint ysrc
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRulerPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRulerPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,27 @@ +var struct__GtkDataboxRulerPrivate = +[ + [ "backing_pixmap", "struct__GtkDataboxRulerPrivate.html#ab8ca0bfaddc5fd8964fc622854a9edc4", null ], + [ "box_shadow", "struct__GtkDataboxRulerPrivate.html#a9c58f43d44f6aeab2e79a4f6447868d5", null ], + [ "draw_position", "struct__GtkDataboxRulerPrivate.html#a260bebbac697be8a9b302a0aef178bea", null ], + [ "draw_subticks", "struct__GtkDataboxRulerPrivate.html#a93c1c15ddd9aa8a3d389b3ba45f36ec1", null ], + [ "draw_ticks", "struct__GtkDataboxRulerPrivate.html#ac9d372b23bea6b0dab221019f4702da2", null ], + [ "invert_edge", "struct__GtkDataboxRulerPrivate.html#a3e9cfaf0debf73d3a43c7c9d172dac32", null ], + [ "linear_format", "struct__GtkDataboxRulerPrivate.html#a0ba20d251ee33cfbc8132a2447d453b0", null ], + [ "log_format", "struct__GtkDataboxRulerPrivate.html#a544e99f32bfaf4f682f50e98f0ce350c", null ], + [ "lower", "struct__GtkDataboxRulerPrivate.html#addbb5c4c5028d7520db36d710b5e2a52", null ], + [ "manual_tick_cnt", "struct__GtkDataboxRulerPrivate.html#aa070e2196fb1bfbab92ec127c7e3e63a", null ], + [ "manual_tick_labels", "struct__GtkDataboxRulerPrivate.html#a21e0fa3752f3e495713ec8f41d003ce5", null ], + [ "manual_ticks", "struct__GtkDataboxRulerPrivate.html#accd82442316fe9d185fa9aa6fad4316e", null ], + [ "max_length", "struct__GtkDataboxRulerPrivate.html#a453afea1ec4774e189740b8a2c0d6ec0", null ], + [ "max_x_text_height", "struct__GtkDataboxRulerPrivate.html#a2619c4306bf4926869befbae996746cd", null ], + [ "max_y_text_width", "struct__GtkDataboxRulerPrivate.html#a70571aa6090738c253189be5a633dedf", null ], + [ "orientation", "struct__GtkDataboxRulerPrivate.html#aedf46649048121d798d8e0932b075031", null ], + [ "position", "struct__GtkDataboxRulerPrivate.html#ac9268185627f180ca2cfbf35c030398a", null ], + [ "scale_type", "struct__GtkDataboxRulerPrivate.html#ad4743d135de132d5f168bcb2fc86a087", null ], + [ "text_alignment", "struct__GtkDataboxRulerPrivate.html#aa38a275b461e9b1bc55e0702e15bf198", null ], + [ "text_hoffset", "struct__GtkDataboxRulerPrivate.html#afec838847bb92e1ac5af771336e2f967", null ], + [ "text_orientation", "struct__GtkDataboxRulerPrivate.html#a7e17a511074990d0a011e58708cffb6f", null ], + [ "upper", "struct__GtkDataboxRulerPrivate.html#a76654653d5409e9ea3dc81eb899affbd", null ], + [ "xsrc", "struct__GtkDataboxRulerPrivate.html#a95a776debc31653f75bfba213f5f2617", null ], + [ "ysrc", "struct__GtkDataboxRulerPrivate.html#a195f0333ea9ebbe7044bda61904bceb6", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +1e2e37b252582d63796d457733d85607 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxRuler__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxRuler__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxXYCGraph Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxXYCGraph Struct Reference
+
+
+ +

#include <gtkdatabox_xyc_graph.h>

+
+Collaboration diagram for _GtkDataboxXYCGraph:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxGraph parent
GtkDataboxXYCGraphPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxXYCGraphPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxXYCGraph = +[ + [ "parent", "struct__GtkDataboxXYCGraph.html#a28801d3e2bdb16c814c7b604cf77a5bc", null ], + [ "priv", "struct__GtkDataboxXYCGraph.html#a5c38febc42731e8db44fc787f94a19c5", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxXYCGraphClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxXYCGraphClass Struct Reference
+
+
+ +

#include <gtkdatabox_xyc_graph.h>

+
+Collaboration diagram for _GtkDataboxXYCGraphClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxXYCGraphClass = +[ + [ "parent_class", "struct__GtkDataboxXYCGraphClass.html#ad1a932cb978a73127c4f92f5a885fcc0", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +e32fa866003495e743f74edebb0e769b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,181 @@ + + + + + +GtkDatabox: _GtkDataboxXYCGraphPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxXYCGraphPrivate Struct Reference
+
+
+ + + + + +

+Data Fields

guint len
gfloat * X
gfloat * Y
+

Field Documentation

+ +
+
+ + + + +
guint len
+
+
+ +
+
+ +
+
+ + + + +
gfloat* X
+
+
+ +
+
+ +
+
+ + + + +
gfloat* Y
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraphPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraphPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,6 @@ +var struct__GtkDataboxXYCGraphPrivate = +[ + [ "len", "struct__GtkDataboxXYCGraphPrivate.html#a9396b3aa1c1db97f91e89516ecaa2e87", null ], + [ "X", "struct__GtkDataboxXYCGraphPrivate.html#acb1c73ed121da9c5b3a784f2f180e890", null ], + [ "Y", "struct__GtkDataboxXYCGraphPrivate.html#aa3a4f852c86ecb67fbe567a270296a12", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +7d0baa792d1c96ce89798bf042ff6ce4 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYCGraph__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYCGraph__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + +GtkDatabox: _GtkDataboxXYYCGraph Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxXYYCGraph Struct Reference
+
+
+ +

#include <gtkdatabox_xyyc_graph.h>

+
+Collaboration diagram for _GtkDataboxXYYCGraph:
+
+
Collaboration graph
+ + +
[legend]
+ + + + +

+Data Fields

GtkDataboxGraph parent
GtkDataboxXYYCGraphPrivate * priv
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxGraph parent
+
+
+ +
+
+ +
+
+ + + + +
GtkDataboxXYYCGraphPrivate* priv
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,5 @@ +var struct__GtkDataboxXYYCGraph = +[ + [ "parent", "struct__GtkDataboxXYYCGraph.html#a28801d3e2bdb16c814c7b604cf77a5bc", null ], + [ "priv", "struct__GtkDataboxXYYCGraph.html#a9834b83f91820342c35506156118bdbc", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass.html 2012-11-09 04:01:23.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + +GtkDatabox: _GtkDataboxXYYCGraphClass Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxXYYCGraphClass Struct Reference
+
+
+ +

#include <gtkdatabox_xyyc_graph.h>

+
+Collaboration diagram for _GtkDataboxXYYCGraphClass:
+
+
Collaboration graph
+ + +
[legend]
+ + + +

+Data Fields

GtkDataboxGraphClass parent_class
+

Field Documentation

+ +
+
+ + + + +
GtkDataboxGraphClass parent_class
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,4 @@ +var struct__GtkDataboxXYYCGraphClass = +[ + [ "parent_class", "struct__GtkDataboxXYYCGraphClass.html#ad1a932cb978a73127c4f92f5a885fcc0", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,3 @@ + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +4933f72001fdfc412595bbd9899da95b \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphClass__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphPrivate.html libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphPrivate.html --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphPrivate.html 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphPrivate.html 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,195 @@ + + + + + +GtkDatabox: _GtkDataboxXYYCGraphPrivate Struct Reference + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+
GtkDatabox + +
+
A set of GTK+ widgets to display large amounts of numerical data quickly and easily.
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+
+Data Fields
+
+
_GtkDataboxXYYCGraphPrivate Struct Reference
+
+
+ + + + + + +

+Data Fields

guint len
gfloat * X
gfloat * Y1
gfloat * Y2
+

Field Documentation

+ +
+
+ + + + +
guint len
+
+
+ +
+
+ +
+
+ + + + +
gfloat* X
+
+
+ +
+
+ +
+
+ + + + +
gfloat* Y1
+
+
+ +
+
+ +
+
+ + + + +
gfloat* Y2
+
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+
+ + + + +
+ +
+ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphPrivate.js libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphPrivate.js --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraphPrivate.js 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraphPrivate.js 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1,7 @@ +var struct__GtkDataboxXYYCGraphPrivate = +[ + [ "len", "struct__GtkDataboxXYYCGraphPrivate.html#a9396b3aa1c1db97f91e89516ecaa2e87", null ], + [ "X", "struct__GtkDataboxXYYCGraphPrivate.html#acb1c73ed121da9c5b3a784f2f180e890", null ], + [ "Y1", "struct__GtkDataboxXYYCGraphPrivate.html#ab4ac44d65eb597e167ed2bc801186b8c", null ], + [ "Y2", "struct__GtkDataboxXYYCGraphPrivate.html#a1e8dc5aeda1e2aa52d5ed33c683ada9a", null ] +]; \ No newline at end of file diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +8008747e9eedf7be2c24ea31254e62cd \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDataboxXYYCGraph__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDataboxXYYCGraph__coll__graph.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox__coll__graph.map libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox__coll__graph.map --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox__coll__graph.map 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox__coll__graph.map 2012-11-09 04:01:22.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox__coll__graph.md5 libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox__coll__graph.md5 --- libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox__coll__graph.md5 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox__coll__graph.md5 2012-11-09 04:01:19.000000000 +0000 @@ -0,0 +1 @@ +7623de2d7b08873730074998bb32b260 \ No newline at end of file Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/struct__GtkDatabox__coll__graph.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/struct__GtkDatabox__coll__graph.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/tab_a.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/tab_a.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/tab_b.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/tab_b.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/tab_h.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/tab_h.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/api/html/tab_s.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/api/html/tab_s.png differ diff -Nru libgtkdatabox-0.9.1.1/api/html/tabs.css libgtkdatabox-0.9.2.0/api/html/tabs.css --- libgtkdatabox-0.9.1.1/api/html/tabs.css 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/api/html/tabs.css 2012-11-09 04:01:18.000000000 +0000 @@ -0,0 +1,59 @@ +.tabs, .tabs2, .tabs3 { + background-image: url('tab_b.png'); + width: 100%; + z-index: 101; + font-size: 13px; +} + +.tabs2 { + font-size: 10px; +} +.tabs3 { + font-size: 9px; +} + +.tablist { + margin: 0; + padding: 0; + display: table; +} + +.tablist li { + float: left; + display: table-cell; + background-image: url('tab_b.png'); + line-height: 36px; + list-style: none; +} + +.tablist a { + display: block; + padding: 0 20px; + font-weight: bold; + background-image:url('tab_s.png'); + background-repeat:no-repeat; + background-position:right; + color: #283A5D; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + text-decoration: none; + outline: none; +} + +.tabs3 .tablist a { + padding: 0 10px; +} + +.tablist a:hover { + background-image: url('tab_h.png'); + background-repeat:repeat-x; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); + text-decoration: none; +} + +.tablist li.current a { + background-image: url('tab_a.png'); + background-repeat:repeat-x; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); +} diff -Nru libgtkdatabox-0.9.1.1/config.guess libgtkdatabox-0.9.2.0/config.guess --- libgtkdatabox-0.9.1.1/config.guess 2008-05-03 00:16:52.000000000 +0000 +++ libgtkdatabox-0.9.2.0/config.guess 2012-03-30 20:31:00.000000000 +0000 @@ -1,10 +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, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2012-02-10' # 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 @@ -17,9 +17,7 @@ # 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,16 +25,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +54,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -144,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -170,7 +169,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -180,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -324,14 +326,33 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -375,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -461,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -475,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -532,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -575,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -640,7 +661,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -711,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -750,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -769,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -784,19 +804,22 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in + *:Interix*:*) + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -806,6 +829,9 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -835,6 +861,27 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -842,20 +889,40 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -866,74 +933,33 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - 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:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + padre:Linux:*:*) + echo sparc-unknown-linux-gnu exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -943,14 +969,17 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -958,78 +987,18 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*: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 + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-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 - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - 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 - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1037,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1058,7 +1027,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1073,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1101,10 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1139,8 +1111,18 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1153,7 +1135,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1173,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1202,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1216,6 +1198,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1243,6 +1228,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1258,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1303,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1324,6 +1322,12 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1346,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru libgtkdatabox-0.9.1.1/config.h.in libgtkdatabox-0.9.2.0/config.h.in --- libgtkdatabox-0.9.1.1/config.h.in 2009-05-11 00:57:53.000000000 +0000 +++ libgtkdatabox-0.9.2.0/config.h.in 2012-11-09 05:04:43.000000000 +0000 @@ -58,6 +58,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -Nru libgtkdatabox-0.9.1.1/config.sub libgtkdatabox-0.9.2.0/config.sub --- libgtkdatabox-0.9.1.1/config.sub 2008-05-03 00:16:52.000000000 +0000 +++ libgtkdatabox-0.9.2.0/config.sub 2012-03-30 20:31:00.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -32,13 +30,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +73,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -120,12 +122,18 @@ # 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-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -148,10 +156,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -166,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -238,24 +249,32 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | 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 | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,29 +287,42 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -300,6 +332,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -314,29 +361,36 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -351,27 +405,32 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -393,7 +452,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -439,6 +498,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -455,10 +518,27 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -487,7 +567,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -526,6 +606,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -641,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -699,6 +782,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -735,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -803,6 +897,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -885,9 +985,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -981,6 +1082,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1037,20 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1120,6 +1212,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1128,6 +1223,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1265,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1213,9 +1312,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1236,10 +1338,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,9 +1351,10 @@ | -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-newlib* | -linux-uclibc* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1258,7 +1362,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1297,7 +1401,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1346,7 +1450,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1388,6 +1492,11 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1410,10 +1519,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1425,8 +1534,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1446,14 +1564,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1480,7 +1595,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1585,7 +1700,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru libgtkdatabox-0.9.1.1/configure libgtkdatabox-0.9.2.0/configure --- libgtkdatabox-0.9.1.1/configure 2009-05-11 00:57:47.000000000 +0000 +++ libgtkdatabox-0.9.2.0/configure 2012-11-09 05:04:28.000000000 +0000 @@ -1,60 +1,83 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gtkdatabox 0.9.1.1. +# Generated by GNU Autoconf 2.68 for gtkdatabox 0.9.2.0. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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. ## -## --------------------- ## +## -------------------- ## +## 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 +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 + # Pre-4.2 versions of Zsh do 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 ;; + 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=: +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -63,20 +86,19 @@ # 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= +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 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -87,354 +109,336 @@ 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; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + 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 +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && 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'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac 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 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_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 - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -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 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false 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 + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } 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. + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 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 + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 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 +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ - 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 - + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_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 || +$as_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" || as_fn_error $? "cannot create directory $as_dir" -fi -fi +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(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 -} +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false 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_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# 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 - 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. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -451,8 +455,7 @@ 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; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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 @@ -462,49 +465,40 @@ 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 +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; 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 + mkdir conf$$.dir 2>/dev/null 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 || +if (echo >conf$$.file) 2>/dev/null; then + 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' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -512,7 +506,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -529,12 +523,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -547,161 +541,14 @@ # 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$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_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 <<_LT_EOF -$* -_LT_EOF - exit 0 -fi -# 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 - -if test -z "$lt_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 && - { 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. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -716,14 +563,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gtkdatabox' PACKAGE_TARNAME='gtkdatabox' -PACKAGE_VERSION='0.9.1.1' -PACKAGE_STRING='gtkdatabox 0.9.1.1' +PACKAGE_VERSION='0.9.2.0' +PACKAGE_STRING='gtkdatabox 0.9.2.0' PACKAGE_BUGREPORT='' +PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ @@ -761,141 +608,179 @@ # 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 -LT_RELEASE -LT_CURRENT -DATABOX_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 -LIBTOOL -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -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 -SED -GREP -EGREP -FGREP -LD -DUMPBIN -ac_ct_DUMPBIN -NM -LN_S -AR -RANLIB -lt_ECHO -DSYMUTIL -NMEDIT -LIPO -OTOOL -OTOOL64 -CPP -PKG_CONFIG -GTK_CFLAGS -GTK_LIBS -PANGO_CFLAGS -PANGO_LIBS -CAIRO_CFLAGS -CAIRO_LIBS -GTK_REQUIRED -PANGO_REQUIRED -CAIRO_REQUIRED -LIBGLADE_CFLAGS -LIBGLADE_LIBS -libglade_moduledir -BUILD_LIBGLADE_TRUE -BUILD_LIBGLADE_FALSE -GLADE3_CFLAGS -GLADE3_LIBS -glade_moduledir -glade_catalogdir -BUILD_GLADE_TRUE -BUILD_GLADE_FALSE +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +GTK_DOC_USE_REBASE_FALSE +GTK_DOC_USE_REBASE_TRUE +GTK_DOC_USE_LIBTOOL_FALSE +GTK_DOC_USE_LIBTOOL_TRUE +GTK_DOC_BUILD_PDF_FALSE +GTK_DOC_BUILD_PDF_TRUE +GTK_DOC_BUILD_HTML_FALSE +GTK_DOC_BUILD_HTML_TRUE +ENABLE_GTK_DOC_FALSE +ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR +GTKDOC_MKPDF +GTKDOC_REBASE GTKDOC_CHECK -ENABLE_GTK_DOC_TRUE -ENABLE_GTK_DOC_FALSE -GTK_DOC_USE_LIBTOOL_TRUE -GTK_DOC_USE_LIBTOOL_FALSE -LIBOBJS -LTLIBOBJS' +BUILD_GLADE_FALSE +BUILD_GLADE_TRUE +glade_catalogdir +glade_moduledir +GLADE3_LIBS +GLADE3_CFLAGS +BUILD_LIBGLADE_FALSE +BUILD_LIBGLADE_TRUE +libglade_moduledir +LIBGLADE_LIBS +LIBGLADE_CFLAGS +CAIRO_REQUIRED +PANGO_REQUIRED +GTK_REQUIRED +CAIRO_LIBS +CAIRO_CFLAGS +PANGO_LIBS +PANGO_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +GTK_LIBS +GTK_CFLAGS +PKG_CONFIG +CPP +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +RANLIB +ac_ct_AR +AR +DLLTOOL +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +SED +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +LIBTOOL +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +DATABOX_VERSION +LT_CURRENT +LT_RELEASE +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_shared +enable_static +with_pic +enable_fast_install +enable_dependency_tracking +with_gnu_ld +with_sysroot +enable_libtool_lock +enable_gtktest +enable_libglade +enable_glade +with_html_dir +enable_gtk_doc +enable_gtk_doc_html +enable_gtk_doc_pdf +' ac_precious_vars='build_alias host_alias target_alias @@ -906,6 +791,8 @@ CPPFLAGS CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR PANGO_CFLAGS PANGO_LIBS CAIRO_CFLAGS @@ -913,12 +800,16 @@ LIBGLADE_CFLAGS LIBGLADE_LIBS GLADE3_CFLAGS -GLADE3_LIBS' +GLADE3_LIBS +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -974,8 +865,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1017,13 +909,20 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`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 ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1036,13 +935,20 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`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 ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1233,22 +1139,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`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 ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`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 ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1268,26 +1188,26 @@ | --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; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) 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; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac 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 + $as_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} + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1295,23 +1215,36 @@ 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; }; } + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. 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 + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. 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; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1325,8 +1258,8 @@ 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 + $as_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 @@ -1341,23 +1274,21 @@ 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; }; } + as_fn_error $? "working directory cannot be determined" 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; }; } + as_fn_error $? "pwd does not report name of working directory" # 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" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1384,13 +1315,11 @@ 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; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 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; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1416,7 +1345,7 @@ # 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 gtkdatabox 0.9.1.1 to adapt to many kinds of systems. +\`configure' configures gtkdatabox 0.9.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1359,7 @@ --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 + -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 @@ -1438,9 +1367,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1450,25 +1379,25 @@ 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/gtkdatabox] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --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/gtkdatabox] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1486,11 +1415,12 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtkdatabox 0.9.1.1:";; + short | recursive ) echo "Configuration of gtkdatabox 0.9.2.0:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1503,14 +1433,18 @@ --disable-gtktest do not try to compile and run a test GTK+ program --enable-libglade enable libglade support --enable-glade enable glade-3 support - --enable-gtk-doc use gtk-doc to build documentation [default=no] + --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --enable-gtk-doc-html build documentation in html format [[default=yes]] + --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -1519,10 +1453,14 @@ 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 + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path PANGO_CFLAGS C compiler flags for PANGO, overriding pkg-config PANGO_LIBS linker flags for PANGO, overriding pkg-config @@ -1536,10 +1474,15 @@ GLADE3_CFLAGS C compiler flags for GLADE3, overriding pkg-config GLADE3_LIBS linker flags for GLADE3, overriding pkg-config + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, 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 the package provider. _ACEOF ac_status=$? fi @@ -1547,15 +1490,17 @@ 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 + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && 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,^\.[\\/],,'` + ac_dir_suffix=/`$as_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,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -1591,7 +1536,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1600,22 +1545,286 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtkdatabox configure 0.9.1.1 -generated by GNU Autoconf 2.61 +gtkdatabox configure 0.9.2.0 +generated by GNU Autoconf 2.68 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2010 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 + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* 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 $2 (); +/* 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_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func 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 gtkdatabox $as_me 0.9.1.1, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by gtkdatabox $as_me 0.9.2.0, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -1651,8 +1860,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1686,12 +1895,12 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1707,13 +1916,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append 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; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1725,11 +1934,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1738,12 +1945,13 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1762,128 +1970,136 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## 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"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## 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"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## 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" + $as_echo "$as_me: caught signal $ac_signal" + $as_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 + trap 'ac_signal='$ac_signal'; as_fn_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 +$as_echo "/* confdefs.h */" > 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 +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" 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;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } 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;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1897,68 +2113,56 @@ 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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_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=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} 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=`$as_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'" ;; + *) as_fn_append 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 - - - - - - - - - - - - - - - - - - - - - - - - + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1973,14 +2177,15 @@ ac_config_headers="$ac_config_headers config.h" -LT_RELEASE=0.9.1 +LT_RELEASE=0.9.2 -LT_CURRENT=1 +LT_CURRENT=0 -DATABOX_VERSION=0.9.1.1 +DATABOX_VERSION=0.9.2.0 -am__api_version='1.10' +#AM_INIT_AUTOMAKE(gtkdatabox, databox_version) +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -1999,9 +2204,7 @@ 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;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2026,22 +2229,23 @@ # 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; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&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/* | \ + # 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\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2059,17 +2263,29 @@ # 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 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -2082,8 +2298,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2093,21 +2309,34 @@ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + # 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` + 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` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2117,11 +2346,8 @@ # 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; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2130,52 +2356,162 @@ # 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; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "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. +# Double any \ or $. # 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 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # 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" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # 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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&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" + $as_echo "$as_me:${as_lineno-$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&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" + $as_echo "$as_me:${as_lineno-$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&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" -{ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&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_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 #( @@ -2187,11 +2523,12 @@ esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2199,12 +2536,11 @@ # 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" case $mkdir_p in @@ -2216,10 +2552,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2229,43 +2565,44 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# 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;; @@ -2275,12 +2612,12 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2299,9 +2636,7 @@ 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; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2316,8 +2651,8 @@ # Define the identity of the package. - PACKAGE=gtkdatabox - VERSION=0.9.1.1 + PACKAGE='gtkdatabox' + VERSION='0.9.2.0' cat >>confdefs.h <<_ACEOF @@ -2345,119 +2680,94 @@ 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 +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&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 -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 + # 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 -done -IFS=$as_save_IFS +rm -rf conftest.dir -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 +if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 else - STRIP="$ac_cv_prog_STRIP" -fi - + am_cv_prog_tar_ustar=$_am_tool 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"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -2466,14 +2776,14 @@ case `pwd` in *\ * | *\ *) - { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.4' -macro_revision='1.2976' +macro_version='2.4.2' +macro_revision='1.3337' @@ -2491,35 +2801,27 @@ # 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 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&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; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 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; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$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; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2535,28 +2837,24 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&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; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$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; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2572,6 +2870,75 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +# Backslashify metacharacters that are still active within +# double-quoted strings. +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 delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -2580,50 +2947,51 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&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 +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # 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 + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +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='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -2642,10 +3010,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2655,25 +3023,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2682,10 +3050,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2695,25 +3063,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2721,12 +3089,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2739,10 +3103,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2752,25 +3116,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2779,10 +3143,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2793,18 +3157,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2823,11 +3187,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2838,10 +3202,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2851,25 +3215,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2882,10 +3246,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2895,25 +3259,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2925,12 +3289,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2940,51 +3300,37 @@ 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; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # 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" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&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 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2996,42 +3342,38 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ 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. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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, @@ -3041,14 +3383,14 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.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; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3067,78 +3409,41 @@ 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 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { 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 - +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ 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 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ 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" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_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_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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 @@ -3146,37 +3451,90 @@ 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.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; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ 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. */ +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3188,51 +3546,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_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; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3246,54 +3599,34 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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 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` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3304,34 +3637,11 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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 + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3342,35 +3652,12 @@ 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 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3381,42 +3668,18 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$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 @@ -3432,18 +3695,14 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3500,31 +3759,9 @@ -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 + if ac_fn_c_try_compile "$LINENO"; 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 @@ -3535,17 +3772,19 @@ # 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; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "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; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3555,10 +3794,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&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 @@ -3566,6 +3805,7 @@ # 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'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3583,6 +3823,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + 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 @@ -3600,7 +3845,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3610,19 +3865,23 @@ break fi ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; 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} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj 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 && + grep $am__obj 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 @@ -3646,8 +3905,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -3661,51 +3920,46 @@ 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 "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done - echo "$ac_script" | sed 99q >conftest.sed - $as_unset ac_script || ac_script= - # Extract the first word of "sed gsed" to use in msg output -if test -z "$SED"; then -set dummy sed gsed; ac_prog_name=$2 -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then ac_path_SED_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # 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 do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue - # Check for GNU ac_path_SED and select it if it is found. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -3717,31 +3971,21 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_SED_found && break 3 + $ac_path_SED_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -SED="$ac_cv_path_SED" -if test -z "$SED"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else ac_cv_path_SED=$SED fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -echo "${ECHO_T}$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -3758,45 +4002,40 @@ -{ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then 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 + # 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. + 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" + $as_echo_n 0123456789 >"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" + $as_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` + as_fn_arith $ac_count + 1 && ac_count=$as_val 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" @@ -3808,77 +4047,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done 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 - + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&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 + if test -z "$EGREP"; then 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 + # 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. + 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" + $as_echo_n 0123456789 >"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" + $as_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` + as_fn_arith $ac_count + 1 && ac_count=$as_val 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" @@ -3890,78 +4113,62 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done 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 - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for fgrep" >&5 -echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else - # Extract the first word of "fgrep" to use in msg output -if test -z "$FGREP"; then -set dummy fgrep; ac_prog_name=$2 -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$FGREP"; then ac_path_FGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # 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 fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue - # Check for GNU ac_path_FGREP and select it if it is found. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in *GNU*) ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'FGREP' >> "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -3973,33 +4180,22 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_FGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -FGREP="$ac_cv_path_FGREP" -if test -z "$FGREP"; 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 - + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_FGREP=$FGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -echo "${ECHO_T}$ac_cv_path_FGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4024,7 +4220,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -4033,8 +4229,8 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4063,14 +4259,14 @@ ;; 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -4100,19 +4296,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4136,10 +4330,10 @@ -{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -4185,21 +4379,24 @@ : ${lt_cv_path_NM=no} fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" 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_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. @@ -4209,25 +4406,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_DUMPBIN="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -echo "${ECHO_T}$DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4236,14 +4433,14 @@ fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" 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_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. @@ -4253,25 +4450,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_DUMPBIN="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4283,18 +4480,23 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -4307,45 +4509,45 @@ -{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; } -if test "${lt_cv_nm_interface+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4317: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4320: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4323: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -echo "${ECHO_T}$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi # 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 else i=0 teststring="ABCD" @@ -4366,7 +4568,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # 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, @@ -4377,6 +4579,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + 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. @@ -4402,6 +4609,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -4441,8 +4653,8 @@ # 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. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -4462,11 +4674,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -4479,28 +4691,28 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ echo "$as_me:$LINENO: result: $xsi_shell" >&5 -echo "${ECHO_T}$xsi_shell" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } -{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -echo "${ECHO_T}$lt_shell_append" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -4534,15 +4746,89 @@ -{ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4550,6 +4836,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -4567,11 +4858,112 @@ +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&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" + $as_echo "$as_me:${as_lineno-$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&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" + $as_echo "$as_me:${as_lineno-$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + -{ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -4612,15 +5004,23 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # 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 + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && 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)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -4645,6 +5045,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -4653,11 +5057,11 @@ 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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? 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_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 @@ -4678,8 +5082,8 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4758,8 +5162,23 @@ esac fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + 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 @@ -4775,13 +5194,167 @@ + + + + + + + + + + +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&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" + $as_echo "$as_me:${as_lineno-$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&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" + $as_echo "$as_me:${as_lineno-$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + 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 + for ac_prog in ar + 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -4791,37 +5364,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$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 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. @@ -4831,52 +5408,108 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi @@ -4887,10 +5520,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -4900,25 +5533,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4927,10 +5560,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -4940,25 +5573,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -4966,12 +5599,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -4990,10 +5619,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -5003,25 +5632,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5030,10 +5659,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -5043,25 +5672,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -5069,12 +5698,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -5098,15 +5723,27 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -5151,10 +5788,10 @@ # 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 else # These are sane defaults that work on at least a few old systems. @@ -5171,7 +5808,7 @@ aix*) symcode='[BCDT]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; hpux*) @@ -5214,8 +5851,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -5239,6 +5876,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -5251,6 +5889,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -5269,18 +5908,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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 + if { { eval echo "\"\$as_me\":${as_lineno-$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 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -5292,6 +5931,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -5303,7 +5954,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -5329,19 +5980,19 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$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 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -5371,11 +6022,18 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' fi @@ -5400,8 +6058,49 @@ + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -5413,11 +6112,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -5431,12 +6130,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5434 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -5470,11 +6169,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -5523,10 +6222,10 @@ # 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 else ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5534,11 +6233,7 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5549,34 +6244,13 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5584,25 +6258,38 @@ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$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*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -5618,16 +6305,133 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. @@ -5637,25 +6441,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -echo "${ECHO_T}$DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5664,10 +6468,10 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; 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_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. @@ -5677,25 +6481,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -5703,12 +6507,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -5720,10 +6520,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. @@ -5733,25 +6533,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -echo "${ECHO_T}$NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5760,10 +6560,10 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; 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_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. @@ -5773,25 +6573,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -5799,12 +6599,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -5816,10 +6612,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; 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_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. @@ -5829,25 +6625,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_LIPO="${ac_tool_prefix}lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { echo "$as_me:$LINENO: result: $LIPO" >&5 -echo "${ECHO_T}$LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5856,10 +6652,10 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; 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_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. @@ -5869,25 +6665,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_LIPO="lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -echo "${ECHO_T}$ac_ct_LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -5895,12 +6691,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -5912,10 +6704,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; 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_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. @@ -5925,25 +6717,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_OTOOL="${ac_tool_prefix}otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { echo "$as_me:$LINENO: result: $OTOOL" >&5 -echo "${ECHO_T}$OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5952,10 +6744,10 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; 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_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. @@ -5965,25 +6757,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_OTOOL="otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -echo "${ECHO_T}$ac_ct_OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -5991,12 +6783,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -6008,10 +6796,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. @@ -6021,25 +6809,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_OTOOL64="${ac_tool_prefix}otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { echo "$as_me:$LINENO: result: $OTOOL64" >&5 -echo "${ECHO_T}$OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6048,10 +6836,10 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; 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_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. @@ -6061,25 +6849,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_OTOOL64="otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -echo "${ECHO_T}$ac_ct_OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -6087,12 +6875,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -6127,10 +6911,10 @@ - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then @@ -6145,7 +6929,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -6154,22 +6944,19 @@ rm -f conftest.* fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6180,39 +6967,53 @@ 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 +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" - lt_cv_ld_exported_symbols_list=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -6240,7 +7041,7 @@ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -6253,15 +7054,15 @@ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&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 + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -6275,11 +7076,7 @@ # 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -6288,76 +7085,34 @@ #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 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 +if ac_fn_c_try_cpp "$LINENO"; 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 +rm -f conftest.err conftest.i 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 +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -6369,8 +7124,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -6380,11 +7135,7 @@ # 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -6393,83 +7144,40 @@ #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 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 +if ac_fn_c_try_cpp "$LINENO"; 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 +rm -f conftest.err conftest.i 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 - : +rm -f conftest.i 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; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6479,16 +7187,12 @@ 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; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -6503,47 +7207,23 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -6553,18 +7233,14 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -6574,14 +7250,10 @@ 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 + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -6607,114 +7279,36 @@ 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 +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + 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 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h 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 +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -6722,58 +7316,13 @@ done - for ac_header in dlfcn.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 +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -6782,6 +7331,8 @@ + + # Set options @@ -6793,7 +7344,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -6824,7 +7375,7 @@ # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -6856,8 +7407,23 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -6872,7 +7438,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -6934,6 +7500,11 @@ + + + + + test -z "$LN_S" && LN_S="ln -s" @@ -6953,10 +7524,10 @@ setopt NO_GLOB_SUBST 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -6968,8 +7539,8 @@ fi rmdir .libs 2>/dev/null fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -6983,19 +7554,6 @@ - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -7008,23 +7566,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -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 delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -7053,7 +7594,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -7061,10 +7602,10 @@ 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -7114,11 +7655,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7127,10 +7668,10 @@ 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -7180,11 +7721,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7258,12 +7799,17 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac - { 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext @@ -7278,15 +7824,15 @@ -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:7281: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7285: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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 @@ -7295,8 +7841,8 @@ $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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$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" @@ -7315,8 +7861,6 @@ 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,' @@ -7350,7 +7894,7 @@ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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 @@ -7364,11 +7908,18 @@ lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) # +Z the default ;; *) @@ -7405,6 +7956,15 @@ lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -7418,7 +7978,7 @@ fi ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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' @@ -7446,14 +8006,34 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc* | ifort*) + # old Intel for x86_64 which still supported -KPIC. + ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -7465,25 +8045,40 @@ # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # 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='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *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' + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' ;; esac ;; @@ -7515,7 +8110,7 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -7572,22 +8167,26 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # 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_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext @@ -7602,15 +8201,15 @@ -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:7605: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7609: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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_pic_works=yes @@ -7619,8 +8218,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7639,14 +8238,19 @@ + + + + + # # 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_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" @@ -7658,7 +8262,7 @@ 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 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -7671,8 +8275,8 @@ LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -7686,10 +8290,10 @@ - { 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null @@ -7707,16 +8311,16 @@ -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:7710: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7714: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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 @@ -7733,18 +8337,18 @@ $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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null @@ -7762,16 +8366,16 @@ -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:7765: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7769: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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 @@ -7788,8 +8392,8 @@ $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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -7797,19 +8401,19 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -7821,8 +8425,8 @@ - { 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -7837,7 +8441,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -7866,7 +8469,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # 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++. @@ -7881,10 +8484,39 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -7902,6 +8534,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [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 ... @@ -7917,11 +8550,12 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, 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. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -7953,14 +8587,16 @@ fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' 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/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 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' @@ -7978,6 +8614,11 @@ fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -7993,7 +8634,7 @@ 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' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -8003,15 +8644,16 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' 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' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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' + pgf77* | pgf90* | pgf95* | pgfortran*) + # 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -8019,13 +8661,20 @@ tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac 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' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -8041,17 +8690,16 @@ fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; 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~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -8065,8 +8713,8 @@ 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' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -8084,8 +8732,8 @@ _LT_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' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8131,8 +8779,8 @@ *) 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' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8172,8 +8820,10 @@ 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 + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". 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' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (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 @@ -8251,6 +8901,7 @@ fi fi + export_dynamic_flag_spec='${wl}-bexpall' # 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 @@ -8260,11 +8911,13 @@ 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 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8275,50 +8928,34 @@ 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 +if ac_fn_c_try_link "$LINENO"; then : -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 "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_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 "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi 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 + aix_libpath=$lt_cv_aix_libpath_ +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 "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${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' @@ -8327,11 +8964,13 @@ 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 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8342,55 +8981,44 @@ 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 +if ac_fn_c_try_link "$LINENO"; then : -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 "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_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 "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi 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 + aix_libpath=$lt_cv_aix_libpath_ +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' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi 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' @@ -8417,25 +9045,69 @@ export_dynamic_flag_spec=-rdynamic ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # 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 "X$deplibs" | $Xsed -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 + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # 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 $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + 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 `func_echo_all "$deplibs" | $SED '\''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' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -8445,11 +9117,20 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then - output_verbose_link_cmd=echo + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -8467,10 +9148,6 @@ 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 @@ -8483,7 +9160,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -8492,7 +9169,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -8500,7 +9177,7 @@ 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' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${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 @@ -8515,14 +9192,13 @@ ;; 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' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${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_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -8534,16 +9210,16 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$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 $pic_flag ${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' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -8555,7 +9231,46 @@ 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' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + 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 + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${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 + ;; esac fi @@ -8583,48 +9298,39 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} -_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 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + lt_cv_irix_exported_symbol=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -8686,17 +9392,17 @@ 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' + 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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -8706,13 +9412,13 @@ 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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${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='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-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; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_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' @@ -8725,9 +9431,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -8876,8 +9582,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -8913,46 +9619,52 @@ # 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* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$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 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 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\":${as_lineno-$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; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -9110,29 +9822,31 @@ - - - - - - { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; 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 + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # 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. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # 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= @@ -9145,7 +9859,7 @@ 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 ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -9165,7 +9879,13 @@ 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` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -9191,7 +9911,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -9200,7 +9920,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -9253,7 +9973,7 @@ m68k) 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -9265,7 +9985,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -9278,14 +9998,15 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -9306,36 +10027,83 @@ 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" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; - mingw*) + mingw* | cegcc*) # 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 + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -9356,7 +10124,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -9364,10 +10132,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -9375,7 +10139,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -9393,7 +10157,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -9413,12 +10177,26 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + 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=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -9464,12 +10242,14 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -9485,7 +10265,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -9522,9 +10302,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -9532,16 +10312,17 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9552,39 +10333,19 @@ 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 - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes 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$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -9593,7 +10354,7 @@ # 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>/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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -9637,7 +10398,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -9706,7 +10467,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -9731,7 +10492,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -9755,7 +10516,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -9786,17 +10547,17 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -9806,8 +10567,8 @@ dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -9908,8 +10669,13 @@ - { 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; } + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -9933,8 +10699,8 @@ # directories. hardcode_action=unsupported fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -9966,7 +10732,7 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; @@ -9978,18 +10744,14 @@ 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10007,39 +10769,18 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10052,102 +10793,18 @@ ;; *) - { 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 + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10165,137 +10822,32 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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; } -if test $ac_cv_lib_dld_shl_load = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" 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 + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10313,53 +10865,28 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10377,53 +10904,28 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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; } -if test $ac_cv_lib_svld_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10441,39 +10943,18 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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; } -if test $ac_cv_lib_dld_dld_link = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10512,10 +10993,10 @@ 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross @@ -10523,7 +11004,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10526 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10564,11 +11045,13 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); #endif -void fnord() { int i=42;} +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10577,20 +11060,24 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else puts (dlerror ()); - exit (status); + return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$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 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -10607,15 +11094,15 @@ fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross @@ -10623,7 +11110,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10626 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10664,11 +11151,13 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); #endif -void fnord() { int i=42;} +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10677,20 +11166,24 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else puts (dlerror ()); - exit (status); + return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$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 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -10707,8 +11200,8 @@ fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -10746,13 +11239,13 @@ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -10760,16 +11253,16 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ;; *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; esac fi @@ -10786,13 +11279,13 @@ # 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -10812,15 +11305,15 @@ fi ;; esac - { echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } @@ -10846,6 +11339,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -10863,10 +11358,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -10876,25 +11371,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10903,10 +11398,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -10916,25 +11411,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -10942,12 +11437,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -10960,10 +11451,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -10973,25 +11464,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11000,10 +11491,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -11014,18 +11505,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -11044,11 +11535,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11059,10 +11550,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -11072,25 +11563,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11103,10 +11594,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -11116,25 +11607,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11146,12 +11637,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -11161,56 +11648,42 @@ 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; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # 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" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&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 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err 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); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11224,54 +11697,34 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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 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` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11282,34 +11735,11 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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 + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11320,35 +11750,12 @@ 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 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11359,42 +11766,18 @@ 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 +if ac_fn_c_try_compile "$LINENO"; 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$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 @@ -11410,18 +11793,14 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&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 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -11478,31 +11857,9 @@ -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 + if ac_fn_c_try_compile "$LINENO"; 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 @@ -11513,17 +11870,19 @@ # 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; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "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; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -11533,10 +11892,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&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 @@ -11544,6 +11903,7 @@ # 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'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -11561,6 +11921,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + 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 @@ -11578,7 +11943,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -11588,19 +11963,23 @@ break fi ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; 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} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj 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 && + grep $am__obj 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 @@ -11624,8 +12003,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -11644,15 +12023,15 @@ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&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 + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -11666,11 +12045,7 @@ # 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -11679,76 +12054,34 @@ #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 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 +if ac_fn_c_try_cpp "$LINENO"; 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 +rm -f conftest.err conftest.i 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 +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -11760,8 +12093,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -11771,11 +12104,7 @@ # 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -11784,83 +12113,40 @@ #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 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 +if ac_fn_c_try_cpp "$LINENO"; 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 +rm -f conftest.err conftest.i 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 - : +rm -f conftest.i 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; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -11869,85 +12155,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -# 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' @@ -11955,7 +12162,7 @@ # Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then +if test "${enable_gtktest+set}" = set; then : enableval=$enable_gtktest; else enable_gtktest=yes @@ -11976,10 +12183,10 @@ # 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_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -11991,14 +12198,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" @@ -12007,11 +12214,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12029,8 +12236,8 @@ fi min_gtk_version=2.8.0 - { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 +$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -12061,14 +12268,10 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$GTK_LIBS $LIBS" rm -f conf.gtktest - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -12081,7 +12284,7 @@ int major, minor, micro; char *tmp_version; - system ("touch conf.gtktest"); + fclose (fopen ("conf.gtktest", "w")); /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_gtk_version"); @@ -12143,50 +12346,26 @@ } _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 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -no_gtk=yes +else + no_gtk=yes fi -rm -f core *.core core.conftest.* 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.beam conftest.$ac_ext fi - CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_gtk" = x ; then - { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 +$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } : else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://pkgconfig.sourceforge.net" @@ -12199,11 +12378,7 @@ ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -12217,24 +12392,7 @@ 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 +if ac_fn_c_try_link "$LINENO"; then : echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK+ or finding the wrong" echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" @@ -12245,15 +12403,11 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -12268,14 +12422,19 @@ + + + + + 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12287,14 +12446,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12302,11 +12461,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12315,10 +12474,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12330,14 +12489,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12345,11 +12504,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -12357,12 +12516,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -12374,63 +12529,62 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi - fi pkg_failed=no -{ echo "$as_me:$LINENO: checking for PANGO" >&5 -echo $ECHO_N "checking for PANGO... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5 +$as_echo_n "checking for PANGO... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$PANGO_CFLAGS"; then - pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\"") >&5 +if test -n "$PANGO_CFLAGS"; then + pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "pango >= 1.16.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.16.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$PANGO_LIBS"; then - pkg_cv_PANGO_LIBS="$PANGO_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\"") >&5 +if test -n "$PANGO_LIBS"; then + pkg_cv_PANGO_LIBS="$PANGO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.16.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "pango >= 1.16.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.16.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12438,25 +12592,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= 1.16.0"` + PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.16.0" 2>&1` else - PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.16.0"` + PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pango >= 1.16.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PANGO_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (pango >= 1.16.0) were not met: - -$PANGO_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 PANGO_CFLAGS -and PANGO_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 (pango >= 1.16.0) were not met: + as_fn_error $? "Package requirements (pango >= 1.16.0) were not met: $PANGO_PKG_ERRORS @@ -12465,21 +12608,13 @@ Alternatively, you may set the environment variables PANGO_CFLAGS and PANGO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 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 PANGO_CFLAGS -and PANGO_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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_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. @@ -12488,60 +12623,59 @@ 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; }; } +See \`config.log' for more details" "$LINENO" 5; } else PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS PANGO_LIBS=$pkg_cv_PANGO_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi pkg_failed=no -{ echo "$as_me:$LINENO: checking for CAIRO" >&5 -echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 +$as_echo_n "checking for CAIRO... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$CAIRO_CFLAGS"; then - pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.4.0\"") >&5 +if test -n "$CAIRO_CFLAGS"; then + pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.4.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "cairo >= 1.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.4.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$CAIRO_LIBS"; then - pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.4.0\"") >&5 +if test -n "$CAIRO_LIBS"; then + pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.4.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "cairo >= 1.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.4.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12549,25 +12683,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= 1.4.0"` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.4.0" 2>&1` else - CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.4.0"` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.4.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CAIRO_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (cairo >= 1.4.0) were not met: - -$CAIRO_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 CAIRO_CFLAGS -and CAIRO_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.4.0) were not met: + as_fn_error $? "Package requirements (cairo >= 1.4.0) were not met: $CAIRO_PKG_ERRORS @@ -12576,21 +12699,13 @@ Alternatively, you may set the environment variables CAIRO_CFLAGS and CAIRO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 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 CAIRO_CFLAGS -and CAIRO_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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_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. @@ -12599,14 +12714,13 @@ 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; }; } +See \`config.log' for more details" "$LINENO" 5; } else CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS CAIRO_LIBS=$pkg_cv_CAIRO_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi GTK_REQUIRED=2.8.0 @@ -12617,62 +12731,62 @@ # ------------------ Libglade configuration ------------------------ # Check whether --enable-libglade was given. -if test "${enable_libglade+set}" = set; then +if test "${enable_libglade+set}" = set; then : enableval=$enable_libglade; ac_cv_enable_libglade=$enableval else ac_cv_enable_libglade=no fi -{ echo "$as_me:$LINENO: checking whether to build libglade support module" >&5 -echo $ECHO_N "checking whether to build libglade support module... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build libglade support module" >&5 +$as_echo_n "checking whether to build libglade support module... " >&6; } if test x"$ac_cv_enable_libglade" = xyes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ echo "$as_me:$LINENO: checking for LIBGLADE" >&5 -echo $ECHO_N "checking for LIBGLADE... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGLADE" >&5 +$as_echo_n "checking for LIBGLADE... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$LIBGLADE_CFLAGS"; then - pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.0.0\"") >&5 +if test -n "$LIBGLADE_CFLAGS"; then + pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.0.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBGLADE_LIBS"; then - pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.0.0\"") >&5 +if test -n "$LIBGLADE_LIBS"; then + pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.0.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_LIBGLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12680,30 +12794,28 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0 >= 2.0.0"` + LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libglade-2.0 >= 2.0.0" 2>&1` else - LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 >= 2.0.0"` + LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libglade-2.0 >= 2.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBGLADE_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ac_cv_enable_libglade=no + ac_cv_enable_libglade=no elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_enable_libglade=no else LIBGLADE_CFLAGS=$pkg_cv_LIBGLADE_CFLAGS LIBGLADE_LIBS=$pkg_cv_LIBGLADE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_enable_libglade=yes fi if test x"$ac_cv_enable_libglade" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define USE_LIBGLADE 1 -_ACEOF +$as_echo "#define USE_LIBGLADE 1" >>confdefs.h libglade_moduledir=`pkg-config libglade-2.0 --variable=moduledir` @@ -12712,13 +12824,13 @@ _ACEOF else - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12736,62 +12848,62 @@ # ------------------ Glade3 configuration ------------------------ # Check whether --enable-glade was given. -if test "${enable_glade+set}" = set; then +if test "${enable_glade+set}" = set; then : enableval=$enable_glade; ac_cv_enable_glade=$enableval else ac_cv_enable_glade=no fi -{ echo "$as_me:$LINENO: checking whether to build glade-3 support module" >&5 -echo $ECHO_N "checking whether to build glade-3 support module... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build glade-3 support module" >&5 +$as_echo_n "checking whether to build glade-3 support module... " >&6; } if test x"$ac_cv_enable_glade" = xyes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ echo "$as_me:$LINENO: checking for GLADE3" >&5 -echo $ECHO_N "checking for GLADE3... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLADE3" >&5 +$as_echo_n "checking for GLADE3... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GLADE3_CFLAGS"; then - pkg_cv_GLADE3_CFLAGS="$GLADE3_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\"") >&5 +if test -n "$GLADE3_CFLAGS"; then + pkg_cv_GLADE3_CFLAGS="$GLADE3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gladeui-1.0 >= 3.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GLADE3_CFLAGS=`$PKG_CONFIG --cflags "gladeui-1.0 >= 3.4.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GLADE3_LIBS"; then - pkg_cv_GLADE3_LIBS="$GLADE3_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\"") >&5 +if test -n "$GLADE3_LIBS"; then + pkg_cv_GLADE3_LIBS="$GLADE3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gladeui-1.0 >= 3.4.0") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GLADE3_LIBS=`$PKG_CONFIG --libs "gladeui-1.0 >= 3.4.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12799,30 +12911,28 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLADE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gladeui-1.0 >= 3.4.0"` + GLADE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gladeui-1.0 >= 3.4.0" 2>&1` else - GLADE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gladeui-1.0 >= 3.4.0"` + GLADE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gladeui-1.0 >= 3.4.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLADE3_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ac_cv_enable_glade=no + ac_cv_enable_glade=no elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_enable_glade=no else GLADE3_CFLAGS=$pkg_cv_GLADE3_CFLAGS GLADE3_LIBS=$pkg_cv_GLADE3_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_enable_glade=yes fi if test x"$ac_cv_enable_glade" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define USE_GLADE 1 -_ACEOF +$as_echo "#define USE_GLADE 1" >>confdefs.h glade_moduledir=`pkg-config gladeui-1.0 --variable=moduledir` @@ -12837,12 +12947,12 @@ _ACEOF else - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12863,88 +12973,282 @@ + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + for ac_prog in gtkdoc-rebase +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_REBASE in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # 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_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +if test -n "$GTKDOC_REBASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +$as_echo "$GTKDOC_REBASE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GTKDOC_REBASE" && break +done +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +set dummy gtkdoc-mkpdf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_MKPDF in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # 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_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +if test -n "$GTKDOC_MKPDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +$as_echo "$GTKDOC_MKPDF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + # Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then +if test "${with_html_dir+set}" = set; then : withval=$with_html_dir; else with_html_dir='${datadir}/gtk-doc/html' fi - HTML_DIR="$with_html_dir" + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi + + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + as_fn_error $? "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5 +fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +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 + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then - enableval=$enable_gtk_doc; -else - enable_gtk_doc=no -fi +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_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 GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - : +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&5 -echo "$as_me: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&2;} - { (exit 1); exit 1; }; } + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi + fi fi - { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 -echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 -echo "${ECHO_T}$enable_gtk_doc" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } - for ac_prog in gtkdoc-check -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_GTKDOC_CHECK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Check whether --enable-gtk-doc-html was given. +if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; else - case $GTKDOC_CHECK in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # 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_GTKDOC_CHECK="$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 + enable_gtk_doc_html=yes fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 -echo "${ECHO_T}$GTKDOC_CHECK" >&6; } + + # Check whether --enable-gtk-doc-pdf was given. +if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + enable_gtk_doc_pdf=no fi - test -n "$GTKDOC_CHECK" && break -done + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi if test x$enable_gtk_doc = xyes; then @@ -12955,6 +13259,22 @@ ENABLE_GTK_DOC_FALSE= fi + if test x$enable_gtk_doc_html = xyes; then + GTK_DOC_BUILD_HTML_TRUE= + GTK_DOC_BUILD_HTML_FALSE='#' +else + GTK_DOC_BUILD_HTML_TRUE='#' + GTK_DOC_BUILD_HTML_FALSE= +fi + + if test x$enable_gtk_doc_pdf = xyes; then + GTK_DOC_BUILD_PDF_TRUE= + GTK_DOC_BUILD_PDF_FALSE='#' +else + GTK_DOC_BUILD_PDF_TRUE='#' + GTK_DOC_BUILD_PDF_FALSE= +fi + if test -n "$LIBTOOL"; then GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' @@ -12963,9 +13283,17 @@ GTK_DOC_USE_LIBTOOL_FALSE= fi + if test -n "$GTKDOC_REBASE"; then + GTK_DOC_USE_REBASE_TRUE= + GTK_DOC_USE_REBASE_FALSE='#' +else + GTK_DOC_USE_REBASE_TRUE='#' + GTK_DOC_USE_REBASE_FALSE= +fi + -ac_config_files="$ac_config_files Makefile gtk/Makefile glade/Makefile examples/Makefile docs/Makefile docs/reference/Makefile gtkdatabox.pc gtkdatabox.spec" +ac_config_files="$ac_config_files Makefile gtk/Makefile glade/Makefile examples/Makefile gtkdatabox.pc gtkdatabox.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12994,12 +13322,13 @@ 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;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -13007,8 +13336,8 @@ (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 \). + # `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" @@ -13030,13 +13359,24 @@ :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 + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -13049,76 +13389,78 @@ ac_libobjs= ac_ltlibobjs= +U= 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"` + ac_i=`$as_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' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +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; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 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; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 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; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_LIBGLADE_TRUE}" && test -z "${BUILD_LIBGLADE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGLADE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_LIBGLADE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILD_LIBGLADE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_GLADE_TRUE}" && test -z "${BUILD_GLADE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_GLADE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_GLADE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILD_GLADE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -13128,59 +13470,79 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## 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 +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 + # Pre-4.2 versions of Zsh do 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 ;; + 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=: +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -13189,20 +13551,19 @@ # 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= +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 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -13213,32 +13574,111 @@ 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; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + 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 +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && 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 +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -13252,13 +13692,17 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=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" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -13273,104 +13717,103 @@ } 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 +# 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 ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; 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 + mkdir conf$$.dir 2>/dev/null 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 || +if (echo >conf$$.file) 2>/dev/null; then + 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' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_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 || +$as_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" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -13387,12 +13830,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -13407,13 +13850,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 gtkdatabox $as_me 0.9.1.1, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by gtkdatabox $as_me 0.9.2.0, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13426,7 +13875,16 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -13434,22 +13892,25 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + --config print configuration, then exit + -q, --quiet, --silent + 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 + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -13460,16 +13921,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtkdatabox config.status 0.9.1.1 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +gtkdatabox config.status 0.9.2.0 +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13477,20 +13939,26 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _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. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. 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=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -13503,34 +13971,41 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append 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; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_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; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -13545,27 +14020,29 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 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 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -13579,130 +14056,154 @@ sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ GREP \ EGREP \ FGREP \ @@ -13712,10 +14213,16 @@ lt_SP2NL \ lt_NL2SP \ reload_flag \ +OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -13725,14 +14232,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -13746,9 +14253,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -13756,12 +14261,13 @@ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -13783,14 +14289,15 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -13798,12 +14305,6 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -13826,7 +14327,7 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -13839,14 +14340,10 @@ "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; "gtkdatabox.pc") CONFIG_FILES="$CONFIG_FILES gtkdatabox.pc" ;; "gtkdatabox.spec") CONFIG_FILES="$CONFIG_FILES gtkdatabox.spec" ;; - *) { { 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; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -13869,286 +14366,302 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_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" + 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 -LT_RELEASE!$LT_RELEASE$ac_delim -LT_CURRENT!$LT_CURRENT$ac_delim -DATABOX_VERSION!$DATABOX_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 -LIBTOOL!$LIBTOOL$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 -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 -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -FGREP!$FGREP$ac_delim -LD!$LD$ac_delim -DUMPBIN!$DUMPBIN$ac_delim -ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim -NM!$NM$ac_delim -LN_S!$LN_S$ac_delim -AR!$AR$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 + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then -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` + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr 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 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -RANLIB!$RANLIB$ac_delim -lt_ECHO!$lt_ECHO$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -LIPO!$LIPO$ac_delim -OTOOL!$OTOOL$ac_delim -OTOOL64!$OTOOL64$ac_delim -CPP!$CPP$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim -PANGO_CFLAGS!$PANGO_CFLAGS$ac_delim -PANGO_LIBS!$PANGO_LIBS$ac_delim -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim -CAIRO_LIBS!$CAIRO_LIBS$ac_delim -GTK_REQUIRED!$GTK_REQUIRED$ac_delim -PANGO_REQUIRED!$PANGO_REQUIRED$ac_delim -CAIRO_REQUIRED!$CAIRO_REQUIRED$ac_delim -LIBGLADE_CFLAGS!$LIBGLADE_CFLAGS$ac_delim -LIBGLADE_LIBS!$LIBGLADE_LIBS$ac_delim -libglade_moduledir!$libglade_moduledir$ac_delim -BUILD_LIBGLADE_TRUE!$BUILD_LIBGLADE_TRUE$ac_delim -BUILD_LIBGLADE_FALSE!$BUILD_LIBGLADE_FALSE$ac_delim -GLADE3_CFLAGS!$GLADE3_CFLAGS$ac_delim -GLADE3_LIBS!$GLADE3_LIBS$ac_delim -glade_moduledir!$glade_moduledir$ac_delim -glade_catalogdir!$glade_catalogdir$ac_delim -BUILD_GLADE_TRUE!$BUILD_GLADE_TRUE$ac_delim -BUILD_GLADE_FALSE!$BUILD_GLADE_FALSE$ac_delim -HTML_DIR!$HTML_DIR$ac_delim -GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim -ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim -ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim -GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim -GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; 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; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -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 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries 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/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # 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. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag 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; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -14167,7 +14680,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_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 `:'. @@ -14176,26 +14689,34 @@ [\\/$]*) 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; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append 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." + configure_input='Generated from '` + $as_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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14205,42 +14726,7 @@ 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" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14258,20 +14744,15 @@ 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; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p 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,^\.[\\/],,'` + ac_dir_suffix=/`$as_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,/,,'` + ac_top_builddir_sub=`$as_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/ ;; @@ -14316,12 +14797,12 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -14329,36 +14810,37 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 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' ;; + 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 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -14369,121 +14851,51 @@ 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 +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 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;} + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_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" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :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;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. -_am_arg=$ac_file +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in @@ -14498,7 +14910,7 @@ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14518,30 +14930,40 @@ 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;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14559,68 +14981,33 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ 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" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14638,16 +15025,12 @@ q } s/.*/./; q'` - test -d "$as_dir" && break + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" 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 +} ;; "libtool":C) @@ -14670,7 +15053,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -14718,6 +15102,15 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -14767,20 +15160,42 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP # 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". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -14789,6 +15204,9 @@ old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -14807,14 +15225,14 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# The name of the directory that contains temporary libtool files. -objdir=$objdir +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO +# The name of the directory that contains temporary libtool files. +objdir=$objdir # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -14822,6 +15240,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -14878,6 +15299,9 @@ # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -14917,6 +15341,10 @@ # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -14929,12 +15357,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -14984,10 +15412,6 @@ # 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 @@ -15021,9 +15445,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -15039,6 +15460,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -15071,212 +15495,169 @@ # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -15286,11 +15667,13 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -15310,16 +15693,20 @@ 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; } + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -{ echo "$as_me:$LINENO: result: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Install libglade-2.0 module: ${ac_cv_enable_libglade} Install glade-3 module: ${ac_cv_enable_glade} " >&5 -echo "${ECHO_T} +$as_echo " Install libglade-2.0 module: ${ac_cv_enable_libglade} Install glade-3 module: ${ac_cv_enable_glade} diff -Nru libgtkdatabox-0.9.1.1/configure.ac libgtkdatabox-0.9.2.0/configure.ac --- libgtkdatabox-0.9.1.1/configure.ac 2009-05-11 00:57:19.000000000 +0000 +++ libgtkdatabox-0.9.2.0/configure.ac 2012-11-09 05:04:16.000000000 +0000 @@ -18,8 +18,8 @@ m4_define([databox_major_version], [0]) # Change in case of really major changes m4_define([databox_minor_version], [9]) # Change in case of changes in exisiting API -m4_define([databox_micro_version], [1]) # Change in case of new functions being added -m4_define([databox_nano_version], [1]) # Change for bug fixes, code cleanup, etc. +m4_define([databox_micro_version], [2]) # Change in case of new functions being added +m4_define([databox_nano_version], [0]) # Change for bug fixes, code cleanup, etc. m4_define([databox_version], [databox_major_version.databox_minor_version.databox_micro_version.databox_nano_version]) AC_INIT(gtkdatabox, databox_version) @@ -32,7 +32,8 @@ AC_SUBST(LT_CURRENT, [databox_nano_version]) AC_SUBST(DATABOX_VERSION, [databox_version]) -AM_INIT_AUTOMAKE(gtkdatabox, databox_version) +#AM_INIT_AUTOMAKE(gtkdatabox, databox_version) +AM_INIT_AUTOMAKE([tar-ustar]) AM_PROG_LIBTOOL @@ -115,8 +116,6 @@ gtk/Makefile \ glade/Makefile \ examples/Makefile \ - docs/Makefile \ - docs/reference/Makefile \ gtkdatabox.pc \ gtkdatabox.spec \ ) diff -Nru libgtkdatabox-0.9.1.1/debian/README.source libgtkdatabox-0.9.2.0/debian/README.source --- libgtkdatabox-0.9.1.1/debian/README.source 2009-08-31 12:50:55.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -This packages uses the quilt patch system. Please read -/usr/share/doc/quilt/README.source for more information. - - -- Andreas Tille Mon, 31 Aug 2009 14:50:19 +0200 diff -Nru libgtkdatabox-0.9.1.1/debian/changelog libgtkdatabox-0.9.2.0/debian/changelog --- libgtkdatabox-0.9.1.1/debian/changelog 2013-04-10 11:34:47.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/changelog 2013-06-02 21:21:10.000000000 +0000 @@ -1,15 +1,86 @@ -libgtkdatabox (1:0.9.1.1-4ubuntu3) raring; urgency=low +libgtkdatabox (1:0.9.2.0-3ubuntu1) saucy; urgency=low - * debian/patches/correct_link.patch: use -lm to fix build issue + * Sync with Debian. Remaining change: + - Cope with 'pkg-config libglade-2.0 --variable=moduledir' returning a + multiarch path. + + -- Jeremy Bicha Sun, 02 Jun 2013 17:21:08 -0400 + +libgtkdatabox (1:0.9.2.0-3) unstable; urgency=low + + [ Daniele E. Domenichelli ] + * Add 05_explicitly_link_libm.patch + * Add 06_gladeui-2.0.patch + * debian/control + - Add quilt to b-d + - Change b-d from libgladeui-1-dev to libgladeui-dev + Closes: #709242 + * debian/rules + - Fix installed files glade3 -> glade - -- Sebastien Bacher Wed, 10 Apr 2013 13:34:23 +0200 + [ Andreas Tille ] + * debian/control: + - Explicit Build-Dependency from quilt is not needed. + - Standards-Version: 3.9.4 (no changes needed) + + -- Andreas Tille Thu, 23 May 2013 20:14:04 +0200 + +libgtkdatabox (1:0.9.2.0-2) unstable; urgency=low + + * debian/control: Add proper conflicts betwen new -doc package and + old -dev package containing the same files + Closes: #708667 -libgtkdatabox (1:0.9.1.1-4ubuntu2) precise; urgency=low + -- Andreas Tille Sat, 18 May 2013 12:26:31 +0200 - * Cope with 'pkg-config libglade-2.0 --variable=moduledir' returning a - multiarch path. +libgtkdatabox (1:0.9.2.0-1) unstable; urgency=low + + * New upstream version + Removed unneeded patche: 03_deprecated_GTK.patch + Refreshed remaining patches + * Reflect move to Git by changing Vcs fields + * debian/control: + - Remove DM-Upload-Allowed + - Standards-Version: 3.9.4 (no changes needed) + - Priority: s/extra/optional/ + - Normalised + - different short descriptions + - new binary package featuring API documentation separately + * debian/rules: New version does not contain docs/reference + any more so no need for extra handling + + -- Andreas Tille Fri, 10 May 2013 08:20:16 +0200 + +libgtkdatabox (1:0.9.1.3-1) experimental; urgency=low + + * Upload to experimental because of freeze + * New upstream version + - Refreshed remaining patches + - Deleted 02_deprecated_GTK.patch which was applied upstream + * Incorporated patch from Ubuntu version below + Closes: #640004 + * debian/README.source: removed because redundant + * debian/control: + - Standards-Version: 3.9.3 + - Updated versioned package names + - Fixed Vcs fields + - Dropped Build-Depends cdbs, quilt + - Do not repeat Section field in binary packages if not + required by d-shlibs + * debhelper 9 (control+compat) + * debian/rules: + - cdbs -> dh + - enable building twice in a row by creating a copy of original + docs/reference which differs drastically from the doc created + in the build process + - implement some dh_install, dh_link calls directly in rules + instead of helper files to reduce the number of cases where + you need to change the package name due to version number + changes + * libgtkdatabox-0.9.1-3.lintian-overrides: Use override because the + symlink check seems to be a false positive here - -- Colin Watson Wed, 25 Jan 2012 09:33:05 +0000 + -- Andreas Tille Wed, 11 Jul 2012 15:02:19 +0200 libgtkdatabox (1:0.9.1.1-4ubuntu1) oneiric; urgency=low diff -Nru libgtkdatabox-0.9.1.1/debian/compat libgtkdatabox-0.9.2.0/debian/compat --- libgtkdatabox-0.9.1.1/debian/compat 2011-07-01 19:54:04.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/compat 2013-05-24 06:01:52.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru libgtkdatabox-0.9.1.1/debian/control libgtkdatabox-0.9.2.0/debian/control --- libgtkdatabox-0.9.1.1/debian/control 2012-01-25 09:33:03.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/control 2013-06-02 21:17:00.000000000 +0000 @@ -1,27 +1,37 @@ Source: libgtkdatabox -Section: libs -Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Science Maintainers -DM-Upload-Allowed: yes Uploaders: Ramakrishnan Muthukrishnan , - Andreas Tille -Build-Depends: debhelper (>= 8), cdbs, autotools-dev, d-shlibs (>= 0.40), - libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev, gtk-doc-tools, - libglade2-dev (>= 1:2.6.4-1ubuntu1), libgladeui-1-dev, quilt -Standards-Version: 3.9.2 -Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/?rev=0&sc=0 -Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libgtkdatabox/trunk/ + Andreas Tille , + Daniele E. Domenichelli +Section: libs +Priority: optional +Build-Depends: debhelper (>= 9), + autotools-dev, + d-shlibs (>= 0.40), + libgtk2.0-dev (>= 2.12.2), + libcairo2-dev, + libpango1.0-dev, + gtk-doc-tools, + libglade2-dev (>= 1:2.6.4-1ubuntu1), + libgladeui-dev, + dh-linktree, + libjs-jquery +Standards-Version: 3.9.4 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libgtkdatabox.git +Vcs-Git: git://anonscm.debian.org/debian-science/packages/libgtkdatabox.git Homepage: http://sourceforge.net/projects/gtkdatabox -Package: libgtkdatabox-0.9.1-1-dev -Section: libdevel +Package: libgtkdatabox-0.9.2-0-dev Architecture: any +Section: libdevel Provides: libgtkdatabox-dev Conflicts: libgtkdatabox-dev -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkdatabox-0.9.1-1 (= ${binary:Version}), - libgtk2.0-dev -Description: Gtk+ library to display large amounts of numerical data +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtkdatabox-0.9.2-0 (= ${binary:Version}), + libgtk2.0-dev +Description: Gtk+ library to display large amounts of numerical data (development) One or more data sets of thousands of data points (X and Y coordinate) may be displayed and updated in split seconds. The widget is therfore used in many scientific and private projects that need to show quickly changing data live. @@ -38,11 +48,12 @@ . Development package -Package: libgtkdatabox-0.9.1-1 +Package: libgtkdatabox-0.9.2-0 Section: libs Architecture: any Replaces: libgtkdatabox -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Gtk+ library to display large amounts of numerical data One or more data sets of thousands of data points (X and Y coordinate) may be displayed and updated in split seconds. The widget is therfore used in many @@ -58,13 +69,14 @@ coordinates, thus allowing you to easily create powerful applications for data analysis. -Package: libgtkdatabox-0.9.1-1-glade -Section: libs +Package: libgtkdatabox-0.9.2-0-glade Architecture: any Provides: libgtkdatabox-glade -Conflicts: libgtkdatabox-glade, libgtkdatabox-0.9.0-1-glade -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Gtk+ library to display large amounts of numerical data +Conflicts: libgtkdatabox-glade, + libgtkdatabox-0.9.0-1-glade +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Gtk+ library to display large amounts of numerical data (glade api) One or more data sets of thousands of data points (X and Y coordinate) may be displayed and updated in split seconds. The widget is therfore used in many scientific and private projects that need to show quickly changing data live. @@ -81,13 +93,14 @@ . Modules for GUI development with Glade3 -Package: libgtkdatabox-0.9.1-1-libglade -Section: libs +Package: libgtkdatabox-0.9.2-0-libglade Architecture: any Provides: libgtkdatabox-libglade -Conflicts: libgtkdatabox-libglade, libgtkdatabox-0.9.0-1-libglade -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Gtk+ library to display large amounts of numerical data +Conflicts: libgtkdatabox-libglade, + libgtkdatabox-0.9.0-1-libglade +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Gtk+ library to display large amounts of numerical data (glade lib) One or more data sets of thousands of data points (X and Y coordinate) may be displayed and updated in split seconds. The widget is therfore used in many scientific and private projects that need to show quickly changing data live. @@ -103,3 +116,26 @@ data analysis. . Libraries for run-time GUI loading with libglade + +Package: libgtkdatabox-0.9.2-0-doc +Section: doc +Architecture: all +Conflicts: libgtkdatabox-0.9.1-1-dev +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Gtk+ library to display large amounts of numerical data (api doc) + One or more data sets of thousands of data points (X and Y coordinate) may be + displayed and updated in split seconds. The widget is therfore used in many + scientific and private projects that need to show quickly changing data live. + GtkDatabox offers the ability to zoom into and out of the data and to navigate + through your data by scrolling. + . + In addition to rulers and a simple coordinate cross, GtkDatabox now also allows + you to add one (or even more) configurable grids like on an oscilloscope. + . + Data may be presented as dots, lines connecting the data, or vertical bars. + The widget allows you to easily transform pixel coordinates into data + coordinates, thus allowing you to easily create powerful applications for + data analysis. + . + This package contains the API documentation. diff -Nru libgtkdatabox-0.9.1.1/debian/copyright libgtkdatabox-0.9.2.0/debian/copyright --- libgtkdatabox-0.9.1.1/debian/copyright 2009-06-24 13:27:57.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/copyright 2013-05-24 06:01:52.000000000 +0000 @@ -1,21 +1,32 @@ -This package was debianized by Ramakrishnan Muthukrishnan on -Fri, 21 Dec 2007 21:06:39 +0530. - -It was downloaded from http://sourceforge.net/projects/gtkdatabox - -Upstream Authors: - Dr. Roland Bock - Brian Phelps - -Copyright: - - Copyright (C) 1998 - 2007 Dr. Roland Bock - -License: - - GNU Lesser General Public License version 2.1 or above. - See /usr/share/common-licenses/LGPL-2.1 - -The Debian packaging is (C) 2007-2009, Ramakrishnan Muthukrishnan -and Andreas Tille and is licensed under the same license as -gtkdatabox itself. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: GtkDatabox +Upstream-Contact: Brian Phelps +Source: http://sourceforge.net/projects/gtkdatabox + +Files: * +Copyright: © 1998-2012 Dr. Roland Bock + © 2008-2013 Brian Phelps +License: LGPL2.1 + +Files: debian/* +Copyright: © 1998-2013 Andreas Tille + © 2007-2009, Ramakrishnan Muthukrishnan +License: LGPL2.1 + +License: LGPL2.1 + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems the full text of GNU Lesser General Public License + version 2.1 can be found at /usr/share/common-licenses/LGPL-2.1 diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-dev.doc-base libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-dev.doc-base --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-dev.doc-base 2009-10-16 19:59:35.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-dev.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Document: libgtkdatabox-dev -Title: Programmers reference for libgtkdatabox -Author: Dr. Roland Bock -Abstract: A Gtk+ library to display large amounts of numerical data - One or more data sets of thousands of data points (X and Y coordinate) may be - displayed and updated in split seconds. The widget is therfore used in many - scientific and private projects that need to show quickly changing data live. - GtkDatabox offers the ability to zoom into and out of the data and to navigate - through your data by scrolling. - . - In addition to rulers and a simple coordinate cross, GtkDatabox now also allows - you to add one (or even more) configurable grids like on an oscilloscope. - . - Data may be presented as dots, lines connecting the data, or vertical bars. - The widget allows you to easily transform pixel coordinates into data - coordinates, thus allowing you to easily create powerful applications for - data analysis. -Section: Science/Data Analysis - -Format: html -Index: /usr/share/doc/libgtkdatabox-0.9.1-1-dev/html -Files: /usr/share/doc/libgtkdatabox-0.9.1-1-dev/html/* diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-dev.links libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-dev.links --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-dev.links 2009-10-16 19:59:35.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-dev.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/doc/libgtkdatabox-0.9.1-1-dev/html usr/share/gtk-doc/html/gtkdatabox diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-glade.install libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-glade.install --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-glade.install 2009-10-16 19:59:35.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-glade.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/tmp/usr/share/glade3/catalogs/gtkdatabox.xml -debian/tmp/usr/lib/glade3/modules/libgladedatabox.* diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-libglade.install libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-libglade.install --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.1-1-libglade.install 2012-01-25 09:27:11.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.1-1-libglade.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libglade/2.0/libdatabox.* diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0-doc.doc-base libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0-doc.doc-base --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0-doc.doc-base 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1,22 @@ +Document: libgtkdatabox-dev +Title: Programmers reference for libgtkdatabox +Author: Dr. Roland Bock +Abstract: A Gtk+ library to display large amounts of numerical data + One or more data sets of thousands of data points (X and Y coordinate) may be + displayed and updated in split seconds. The widget is therfore used in many + scientific and private projects that need to show quickly changing data live. + GtkDatabox offers the ability to zoom into and out of the data and to navigate + through your data by scrolling. + . + In addition to rulers and a simple coordinate cross, GtkDatabox now also allows + you to add one (or even more) configurable grids like on an oscilloscope. + . + Data may be presented as dots, lines connecting the data, or vertical bars. + The widget allows you to easily transform pixel coordinates into data + coordinates, thus allowing you to easily create powerful applications for + data analysis. +Section: Science/Data Analysis + +Format: html +Index: /usr/share/doc/libgtkdatabox-0.9.2-0-doc/html +Files: /usr/share/doc/libgtkdatabox-0.9.2-0-doc/html/* diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0-doc.docs libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0-doc.docs --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0-doc.docs 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0-doc.docs 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1 @@ +api/* diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0-doc.linktrees libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0-doc.linktrees --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0-doc.linktrees 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0-doc.linktrees 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1 @@ +replace usr/share/javascript/jquery/jquery.js usr/share/doc/libgtkdatabox-0.9.2-0-doc/html/jquery.js diff -Nru libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0.lintian-overrides libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0.lintian-overrides --- libgtkdatabox-0.9.1.1/debian/libgtkdatabox-0.9.2-0.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/libgtkdatabox-0.9.2-0.lintian-overrides 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1,3 @@ +# The needed link is provided but without the version number (just as it was created by the build process) +libgtkdatabox-0.9.2-0: dev-pkg-without-shlib-symlink usr/lib/libgtkdatabox-* usr/lib/libgtkdatabox-*.so + diff -Nru libgtkdatabox-0.9.1.1/debian/patches/01_libglage_example.patch libgtkdatabox-0.9.2.0/debian/patches/01_libglage_example.patch --- libgtkdatabox-0.9.1.1/debian/patches/01_libglage_example.patch 2008-11-06 08:43:40.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/01_libglage_example.patch 2013-05-24 06:01:52.000000000 +0000 @@ -1,5 +1,7 @@ ---- libgtkdatabox-0.9.0.1.orig/examples/basics_libglade.c -+++ libgtkdatabox-0.9.0.1/examples/basics_libglade.c +Description: Enable libglade example to work in any case + +--- libgtkdatabox.orig/examples/basics_libglade.c ++++ libgtkdatabox/examples/basics_libglade.c @@ -29,19 +29,13 @@ #include #include diff -Nru libgtkdatabox-0.9.1.1/debian/patches/02_deprecated_GTK.patch libgtkdatabox-0.9.2.0/debian/patches/02_deprecated_GTK.patch --- libgtkdatabox-0.9.1.1/debian/patches/02_deprecated_GTK.patch 2010-05-17 10:06:14.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/02_deprecated_GTK.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,141 +0,0 @@ -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2010-05-08 14:18:44.719930631 +0200 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2010-05-08 14:18:27.159915281 +0200 -@@ -1104,7 +1104,7 @@ - - widget->allocation = *allocation; - -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (widget)) - { - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, -@@ -1154,7 +1154,7 @@ - } - - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], -+ widget->style->fg_gc[gtk_widget_get_state (widget)], - box->priv->backing_pixmap, - event->area.x, event->area.y, - event->area.x, event->area.y, -@@ -1443,7 +1443,7 @@ - /* Copy a part of the backing_pixmap to the screen */ - if (pixmapCopyRect) - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (box)], -+ widget->style->fg_gc[gtk_widget_get_state (box)], - box->priv->backing_pixmap, - pixmapCopyRect->x, - pixmapCopyRect->y, -@@ -1771,7 +1771,7 @@ - static void - gtk_databox_calculate_visible_limits (GtkDatabox * box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2010-05-08 14:18:45.071934115 +0200 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2010-05-08 14:18:41.527924716 +0200 -@@ -323,7 +323,7 @@ - } - g_object_thaw_notify (G_OBJECT (ruler)); - -- if (GTK_WIDGET_DRAWABLE (ruler)) -+ if (gtk_widget_is_drawable (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); - } - -@@ -354,7 +354,7 @@ - } - g_object_thaw_notify (G_OBJECT (ruler)); - -- if (GTK_WIDGET_DRAWABLE (ruler)) -+ if (gtk_widget_is_drawable (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); - } - -@@ -378,7 +378,7 @@ - /* g_object_notify (G_OBJECT (ruler), "scale-type"); */ - } - -- if (GTK_WIDGET_DRAWABLE (ruler)) -+ if (gtk_widget_is_drawable (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); - } - -@@ -414,7 +414,7 @@ - widget->requisition.width = widget->style->xthickness * 2 + RULER_SIZE; - } - -- if (GTK_WIDGET_DRAWABLE (ruler)) -+ if (gtk_widget_is_drawable (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); - } - -@@ -529,7 +529,7 @@ - g_sprintf (format_string, "%%-%dg", ruler->priv->max_length - 1); - - -- if (!GTK_WIDGET_DRAWABLE (ruler)) -+ if (!gtk_widget_is_drawable (ruler)) - return; - - widget = GTK_WIDGET (ruler); -@@ -682,14 +682,14 @@ - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - gtk_paint_layout (widget->style, - ruler->priv->backing_pixmap, -- GTK_WIDGET_STATE (widget), -+ gtk_widget_get_state (widget), - FALSE, - NULL, - widget, "ruler", pos + 2, ythickness - 1, layout); - else - gtk_paint_layout (widget->style, - ruler->priv->backing_pixmap, -- GTK_WIDGET_STATE (widget), -+ gtk_widget_get_state (widget), - FALSE, - NULL, - widget, -@@ -761,7 +761,7 @@ - gint ythickness; - gdouble increment; - -- if (GTK_WIDGET_DRAWABLE (ruler)) -+ if (gtk_widget_is_drawable (ruler)) - { - xthickness = widget->style->xthickness; - ythickness = widget->style->ythickness; -@@ -893,7 +893,7 @@ - - widget->allocation = *allocation; - -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (widget)) - { - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, -@@ -908,14 +908,14 @@ - { - GtkDataboxRuler *ruler; - -- if (GTK_WIDGET_DRAWABLE (widget)) -+ if (gtk_widget_is_drawable (widget)) - { - ruler = GTK_DATABOX_RULER (widget); - - gtk_databox_ruler_draw_ticks (ruler); - - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (ruler)], -+ widget->style->fg_gc[gtk_widget_get_state (ruler)], - ruler->priv->backing_pixmap, - 0, 0, 0, 0, - widget->allocation.width, widget->allocation.height); diff -Nru libgtkdatabox-0.9.1.1/debian/patches/03_deprecated_GTK.patch libgtkdatabox-0.9.2.0/debian/patches/03_deprecated_GTK.patch --- libgtkdatabox-0.9.1.1/debian/patches/03_deprecated_GTK.patch 2011-05-25 06:39:18.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/03_deprecated_GTK.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,193 +0,0 @@ -Index: libgtkdatabox-0.9.1.1/examples/addremove.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/addremove.c 2011-05-21 12:39:01.703594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/addremove.c 2011-05-21 12:36:16.739594810 +0200 -@@ -203,7 +203,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/basics.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/basics.c 2011-05-21 12:39:02.075594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/basics.c 2011-05-21 12:36:16.759594820 +0200 -@@ -113,7 +113,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -Index: libgtkdatabox-0.9.1.1/examples/basics2.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/basics2.c 2011-05-21 12:39:01.911594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/basics2.c 2011-05-21 12:36:16.747594818 +0200 -@@ -225,7 +225,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -Index: libgtkdatabox-0.9.1.1/examples/colors.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/colors.c 2011-05-21 12:39:02.115594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/colors.c 2011-05-21 12:36:16.763594819 +0200 -@@ -194,7 +194,7 @@ - g_signal_connect (G_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), (gpointer) NULL); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - -Index: libgtkdatabox-0.9.1.1/examples/enable_disable.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/enable_disable.c 2011-05-21 12:39:01.787594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/enable_disable.c 2011-05-21 12:36:16.743594812 +0200 -@@ -145,7 +145,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - for (i = 0; i < noEnableSets; ++i) - { - GtkWidget *vbox = gtk_vbox_new (FALSE, 10); -Index: libgtkdatabox-0.9.1.1/examples/grid.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/grid.c 2011-05-21 12:39:01.995594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/grid.c 2011-05-21 12:36:16.755594821 +0200 -@@ -133,7 +133,7 @@ - G_CALLBACK (gtk_main_quit), - GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/grid_array.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/grid_array.c 2011-05-21 12:39:01.951594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/grid_array.c 2011-05-21 12:36:16.751594821 +0200 -@@ -134,7 +134,7 @@ - G_CALLBACK (gtk_main_quit), - GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/keycontrol.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/keycontrol.c 2011-05-21 12:39:02.155594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/keycontrol.c 2011-05-21 12:37:15.211595055 +0200 -@@ -133,7 +133,8 @@ - gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table, - TRUE, TRUE, TRUE, TRUE); - gtk_widget_add_events (box, GDK_KEY_PRESS_MASK); -- GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT); -+ gtk_widget_set_can_focus(box, GTK_CAN_FOCUS); -+ gtk_widget_set_can_default(box, GTK_CAN_DEFAULT); - - gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); - -Index: libgtkdatabox-0.9.1.1/examples/lissajous.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/lissajous.c 2011-05-21 12:39:02.035594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/lissajous.c 2011-05-21 12:36:16.759594820 +0200 -@@ -154,7 +154,7 @@ - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); - - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box); - -Index: libgtkdatabox-0.9.1.1/examples/logarithmic.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/logarithmic.c 2011-05-21 12:39:01.827594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/logarithmic.c 2011-05-21 12:36:16.743594812 +0200 -@@ -207,7 +207,7 @@ - g_signal_connect (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), NULL); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -Index: libgtkdatabox-0.9.1.1/examples/markers.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/markers.c 2011-05-21 12:39:01.871594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/markers.c 2011-05-21 12:36:16.747594818 +0200 -@@ -220,7 +220,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/signals.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/signals.c 2011-05-21 12:39:01.751594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/signals.c 2011-05-21 12:36:16.743594812 +0200 -@@ -287,7 +287,7 @@ - g_signal_connect_swapped (G_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - g_signal_connect (G_OBJECT (box), "zoomed", -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2011-05-21 12:39:01.583594722 +0200 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-05-21 12:38:43.523595004 +0200 -@@ -453,7 +453,8 @@ - gint width; - gint height; - -- gdk_drawable_get_size (widget->window, &width, &height); -+ width = gdk_window_get_width(widget->window); -+ height = gdk_window_get_height(widget->window); - x = MAX (0, MIN (width - 1, x)); - y = MAX (0, MIN (height - 1, y)); - -@@ -587,7 +588,7 @@ - gint attributes_mask; - - box = GTK_DATABOX (widget); -- GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED); -+ gtk_widget_set_realized(box, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2011-05-21 12:39:01.631594722 +0200 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-05-21 12:38:59.963594710 +0200 -@@ -842,7 +842,7 @@ - gint attributes_mask; - - ruler = GTK_DATABOX_RULER (widget); -- GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED); -+ gtk_widget_set_realized(ruler, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; diff -Nru libgtkdatabox-0.9.1.1/debian/patches/04_missing_includes.patch libgtkdatabox-0.9.2.0/debian/patches/04_missing_includes.patch --- libgtkdatabox-0.9.1.1/debian/patches/04_missing_includes.patch 2011-09-01 12:02:36.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/04_missing_includes.patch 2013-05-24 06:01:52.000000000 +0000 @@ -1,8 +1,10 @@ +Author: Matthias Klose +Date: Thu, 1 Sep 2011 13:03:19 UTC +Bug-Debian: http://bugs.debian.org/640004 +Description: Add missing function prototype definition -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_graph.c 2011-09-01 11:57:17.508763081 +0000 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c 2011-09-01 12:02:30.429222172 +0000 +--- libgtkdatabox.orig/gtk/gtkdatabox_graph.c ++++ libgtkdatabox/gtk/gtkdatabox_graph.c @@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -14,10 +16,8 @@ #include #include #include -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_markers.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_markers.c 2011-09-01 11:57:17.518763088 +0000 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_markers.c 2011-09-01 12:01:38.889146365 +0000 +--- libgtkdatabox.orig/gtk/gtkdatabox_markers.c ++++ libgtkdatabox/gtk/gtkdatabox_markers.c @@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -Nru libgtkdatabox-0.9.1.1/debian/patches/05_explicit_link_libm.patch libgtkdatabox-0.9.2.0/debian/patches/05_explicit_link_libm.patch --- libgtkdatabox-0.9.1.1/debian/patches/05_explicit_link_libm.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/05_explicit_link_libm.patch 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Explicitly link libm in examples + Examples use sin and cos to generate plots. + Using ld.gold, it is necessary to link libm explicitly, since it is no + longer linked automatically with other dependencies. +Author: Daniele E. Domenichelli +Last-Update: 2013-05-23 + +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -61,14 +61,16 @@ AM_CFLAGS =\ + + + LDADD = $(top_builddir)/gtk/libgtkdatabox.la\ +- @GTK_LIBS@ ++ @GTK_LIBS@\ ++ -lm + + + if BUILD_LIBGLADE + basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \ + $(top_builddir)/glade/libdatabox.la \ + @GTK_LIBS@ \ +- @LIBGLADE_LIBS@ ++ @LIBGLADE_LIBS@ \ ++ -lm + else + basics_libglade_LDADD = $(LDADD) + endif +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -311,13 +311,15 @@ AM_CFLAGS = \ + `pkg-config gtk+-2.0 --cflags` + + LDADD = $(top_builddir)/gtk/libgtkdatabox.la\ +- @GTK_LIBS@ ++ @GTK_LIBS@\ ++ -lm + + @BUILD_LIBGLADE_FALSE@basics_libglade_LDADD = $(LDADD) + @BUILD_LIBGLADE_TRUE@basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \ + @BUILD_LIBGLADE_TRUE@ $(top_builddir)/glade/libdatabox.la \ + @BUILD_LIBGLADE_TRUE@ @GTK_LIBS@ \ +-@BUILD_LIBGLADE_TRUE@ @LIBGLADE_LIBS@ ++@BUILD_LIBGLADE_TRUE@ @LIBGLADE_LIBS@ \ ++@BUILD_LIBGLADE_TRUE@ -lm + + all: all-am + diff -Nru libgtkdatabox-0.9.1.1/debian/patches/06_gladeui-2.0.patch libgtkdatabox-0.9.2.0/debian/patches/06_gladeui-2.0.patch --- libgtkdatabox-0.9.1.1/debian/patches/06_gladeui-2.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/06_gladeui-2.0.patch 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1,144 @@ +Description: Update build system to use gladeui-2.0 instead of gladeui-1.0 +Bug-Debian: http://bugs.debian.org/709242 +Author: Daniele E. Domenichelli +Last-Update: 2013-05-26 + +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,7 @@ PKG_CHECK_MODULES(CAIRO, cairo >= [cairo + AC_SUBST(GTK_REQUIRED, [gtk_required_version]) + AC_SUBST(PANGO_REQUIRED, [pango_required_version]) + AC_SUBST(CAIRO_REQUIRED, [cairo_required_version]) ++AC_SUBST(GTK_CFLAGS) + + # ------------------ Libglade configuration ------------------------ + AC_ARG_ENABLE(libglade, +@@ -86,13 +87,13 @@ AC_ARG_ENABLE(glade, + AC_MSG_CHECKING([whether to build glade-3 support module]) + if test x"$ac_cv_enable_glade" = xyes; then + AC_MSG_RESULT(yes) +- PKG_CHECK_MODULES(GLADE3, gladeui-1.0 >= 3.4.0, ++ PKG_CHECK_MODULES(GLADE3, gladeui-2.0 >= 3.4.0, + ac_cv_enable_glade=yes, ac_cv_enable_glade=no) + if test x"$ac_cv_enable_glade" = xyes; then + AC_DEFINE(USE_GLADE, 1, Define if you want glade interface builder support) +- glade_moduledir=`pkg-config gladeui-1.0 --variable=moduledir` ++ glade_moduledir=`pkg-config gladeui-2.0 --variable=moduledir` + AC_DEFINE_UNQUOTED(GLADE_MODULEDIR, [$glade_moduledir], [Glade-3 module directory]) +- glade_catalogdir=`pkg-config gladeui-1.0 --variable=catalogdir` ++ glade_catalogdir=`pkg-config gladeui-2.0 --variable=catalogdir` + AC_DEFINE_UNQUOTED(GLADE_CATALOGDIR, [$glade_catalogdir], [Glade-3 catalog directory]) + else + AC_MSG_RESULT(not found) +--- a/configure ++++ b/configure +@@ -12868,12 +12868,12 @@ if test -n "$GLADE3_CFLAGS"; then + pkg_cv_GLADE3_CFLAGS="$GLADE3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gladeui-1.0 >= 3.4.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-2.0 >= 3.4.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gladeui-2.0 >= 3.4.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GLADE3_CFLAGS=`$PKG_CONFIG --cflags "gladeui-1.0 >= 3.4.0" 2>/dev/null` ++ pkg_cv_GLADE3_CFLAGS=`$PKG_CONFIG --cflags "gladeui-2.0 >= 3.4.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -12885,12 +12885,12 @@ if test -n "$GLADE3_LIBS"; then + pkg_cv_GLADE3_LIBS="$GLADE3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gladeui-1.0 >= 3.4.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-2.0 >= 3.4.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gladeui-2.0 >= 3.4.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GLADE3_LIBS=`$PKG_CONFIG --libs "gladeui-1.0 >= 3.4.0" 2>/dev/null` ++ pkg_cv_GLADE3_LIBS=`$PKG_CONFIG --libs "gladeui-2.0 >= 3.4.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -12911,9 +12911,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLADE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gladeui-1.0 >= 3.4.0" 2>&1` ++ GLADE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gladeui-2.0 >= 3.4.0" 2>&1` + else +- GLADE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gladeui-1.0 >= 3.4.0" 2>&1` ++ GLADE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gladeui-2.0 >= 3.4.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLADE3_PKG_ERRORS" >&5 +@@ -12934,13 +12934,13 @@ fi + + $as_echo "#define USE_GLADE 1" >>confdefs.h + +- glade_moduledir=`pkg-config gladeui-1.0 --variable=moduledir` ++ glade_moduledir=`pkg-config gladeui-2.0 --variable=moduledir` + + cat >>confdefs.h <<_ACEOF + #define GLADE_MODULEDIR $glade_moduledir + _ACEOF + +- glade_catalogdir=`pkg-config gladeui-1.0 --variable=catalogdir` ++ glade_catalogdir=`pkg-config gladeui-2.0 --variable=catalogdir` + + cat >>confdefs.h <<_ACEOF + #define GLADE_CATALOGDIR $glade_catalogdir +--- a/glade/Makefile.am ++++ b/glade/Makefile.am +@@ -12,7 +12,9 @@ INCLUDES = \ + glademoduledir = @libglade_moduledir@ + glademodule_LTLIBRARIES = libdatabox.la + +-libdatabox_la_CFLAGS = @LIBGLADE_CFLAGS@ ++libdatabox_la_CFLAGS = \ ++ @GTK_CFLAGS@ \ ++ @LIBGLADE_CFLAGS@ + + libdatabox_la_LIBADD = \ + $(top_builddir)/gtk/libgtkdatabox.la \ +@@ -39,7 +41,9 @@ INCLUDES = \ + gladeuimoduledir = @glade_moduledir@ + gladeuimodule_LTLIBRARIES = libgladedatabox.la + +-libgladedatabox_la_CFLAGS = @GLADE3_CFLAGS@ ++libgladedatabox_la_CFLAGS = \ ++ @GTK_CFLAGS@ \ ++ @GLADE3_CFLAGS@ + + libgladedatabox_la_LIBADD = \ + $(top_builddir)/gtk/libgtkdatabox.la \ +--- a/glade/Makefile.in ++++ b/glade/Makefile.in +@@ -276,7 +276,10 @@ top_srcdir = @top_srcdir@ + # @LIBGLADE_CFLAGS@ + @BUILD_LIBGLADE_TRUE@glademoduledir = @libglade_moduledir@ + @BUILD_LIBGLADE_TRUE@glademodule_LTLIBRARIES = libdatabox.la +-@BUILD_LIBGLADE_TRUE@libdatabox_la_CFLAGS = @LIBGLADE_CFLAGS@ ++@BUILD_LIBGLADE_TRUE@libdatabox_la_CFLAGS = \ ++@BUILD_LIBGLADE_TRUE@ @GTK_CFLAGS@ \ ++@BUILD_LIBGLADE_TRUE@ @LIBGLADE_CFLAGS@ ++ + @BUILD_LIBGLADE_TRUE@libdatabox_la_LIBADD = \ + @BUILD_LIBGLADE_TRUE@ $(top_builddir)/gtk/libgtkdatabox.la \ + @BUILD_LIBGLADE_TRUE@ @LIBGLADE_LIBS@ +@@ -289,7 +292,10 @@ top_srcdir = @top_srcdir@ + + @BUILD_GLADE_TRUE@gladeuimoduledir = @glade_moduledir@ + @BUILD_GLADE_TRUE@gladeuimodule_LTLIBRARIES = libgladedatabox.la +-@BUILD_GLADE_TRUE@libgladedatabox_la_CFLAGS = @GLADE3_CFLAGS@ ++@BUILD_GLADE_TRUE@libgladedatabox_la_CFLAGS = \ ++@BUILD_GLADE_TRUE@ @GTK_CFLAGS@ \ ++@BUILD_GLADE_TRUE@ @GLADE3_CFLAGS@ ++ + @BUILD_GLADE_TRUE@libgladedatabox_la_LIBADD = \ + @BUILD_GLADE_TRUE@ $(top_builddir)/gtk/libgtkdatabox.la \ + @BUILD_GLADE_TRUE@ @GLADE3_LIBS@ diff -Nru libgtkdatabox-0.9.1.1/debian/patches/correct_link.patch libgtkdatabox-0.9.2.0/debian/patches/correct_link.patch --- libgtkdatabox-0.9.1.1/debian/patches/correct_link.patch 2013-04-10 11:37:24.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/correct_link.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -diff -Nur libgtkdatabox-0.9.1.1/examples/Makefile.am libgtkdatabox-0.9.1.1.build/examples/Makefile.am ---- libgtkdatabox-0.9.1.1/examples/Makefile.am 2009-04-20 00:15:49.000000000 +0200 -+++ libgtkdatabox-0.9.1.1.build/examples/Makefile.am 2013-04-10 13:36:57.000296548 +0200 -@@ -58,14 +58,14 @@ - - - LDADD = $(top_builddir)/gtk/libgtkdatabox.la\ -- @GTK_LIBS@ -+ @GTK_LIBS@ -lm - - - if BUILD_LIBGLADE - basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \ - $(top_builddir)/glade/libdatabox.la \ - @GTK_LIBS@ \ -- @LIBGLADE_LIBS@ -+ @LIBGLADE_LIBS@ -lm - else - basics_libglade_LDADD = $(LDADD) - endif -diff -Nur libgtkdatabox-0.9.1.1/examples/Makefile.in libgtkdatabox-0.9.1.1.build/examples/Makefile.in ---- libgtkdatabox-0.9.1.1/examples/Makefile.in 2009-05-11 02:57:46.000000000 +0200 -+++ libgtkdatabox-0.9.1.1.build/examples/Makefile.in 2013-04-10 13:37:01.872296710 +0200 -@@ -290,13 +290,13 @@ - `pkg-config gtk+-2.0 --cflags` - - LDADD = $(top_builddir)/gtk/libgtkdatabox.la\ -- @GTK_LIBS@ -+ @GTK_LIBS@ -lm - - @BUILD_LIBGLADE_FALSE@basics_libglade_LDADD = $(LDADD) - @BUILD_LIBGLADE_TRUE@basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \ - @BUILD_LIBGLADE_TRUE@ $(top_builddir)/glade/libdatabox.la \ - @BUILD_LIBGLADE_TRUE@ @GTK_LIBS@ \ --@BUILD_LIBGLADE_TRUE@ @LIBGLADE_LIBS@ -+@BUILD_LIBGLADE_TRUE@ @LIBGLADE_LIBS@ -lm - - all: all-am - diff -Nru libgtkdatabox-0.9.1.1/debian/patches/series libgtkdatabox-0.9.2.0/debian/patches/series --- libgtkdatabox-0.9.1.1/debian/patches/series 2013-04-10 11:34:03.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/patches/series 2013-05-24 06:01:52.000000000 +0000 @@ -1,5 +1,4 @@ 01_libglage_example.patch -02_deprecated_GTK.patch -03_deprecated_GTK.patch 04_missing_includes.patch -correct_link.patch +05_explicit_link_libm.patch +06_gladeui-2.0.patch diff -Nru libgtkdatabox-0.9.1.1/debian/rules libgtkdatabox-0.9.2.0/debian/rules --- libgtkdatabox-0.9.1.1/debian/rules 2011-07-01 19:53:43.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/rules 2013-06-02 21:14:00.000000000 +0000 @@ -1,14 +1,22 @@ #!/usr/bin/make -f -# rules file for gtkdatabox using cdbs +# rules file for gtkdatabox using dh # Andreas Tille # License: GPL -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 -pkg=$(shell grep -v -- "-dev" debian/control | sed -n 's/^Package: \+\([^-]\+\)-.*/\1/p' | head -n 1) -devpkg=$(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' | head -n 1) +pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +devpkg := $(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' | head -n 1) +docpkg := $(shell grep -- "-doc" debian/control | sed -n 's/^Package: //p' | head -n 1) +gladepkg := $(shell grep -- "-glade" debian/control | sed -n 's/^Package: //p' | head -n 1) +libglade := $(shell grep -- "-libglade" debian/control | sed -n 's/^Package: //p' | head -n 1) +ver := $(shell dpkg-parsechangelog | grep '^Version:' | sed 's/^Version: [0-9]\+:\(.*\)\.[0-9]-[0-9]/\1/') + +arch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +%: + dh $@ --with autotools_dev --with linktree DEB_INSTALL_DOCS_ALL := AUTHORS README @@ -17,28 +25,48 @@ --enable-glade \ --enable-gtk-doc -DEB_COMPRESS_EXCLUDE := .devhelp +override_dh_auto_configure: + dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) -common-binary-post-install-arch:: - # Call d-shlibmove to comply with library packaging guide - d-devlibdeps debian/$(devpkg).substvars \ - debian/tmp/usr/lib/$(pkg).so +override_dh_compress: + dh_compress --exclude=.devhelp +override_dh_install: + dh_install # Do not use debian/$(devpkg).examples as debhelper input because # you always have to adapt the file name when a new version pops up mkdir -p debian/$(devpkg)/usr/share/doc/$(devpkg)/examples cp -a examples/*.[ch] examples/*.glade debian/$(devpkg)/usr/share/doc/$(devpkg)/examples cp -a debian/Makefile.testdatabox debian/$(devpkg)/usr/share/doc/$(devpkg)/examples/Makefile + # Same here for the other binary packages to avoid renaming + dh_install -p$(gladepkg) usr/share/glade/catalogs/gtkdatabox.xml + dh_install -p$(gladepkg) usr/lib/glade/modules/libgladedatabox.* + dh_install -p$(libglade) usr/lib/*/libglade/2.0/libdatabox.* + + # Call d-shlibmove to comply with library packaging guide + d-devlibdeps debian/$(devpkg).substvars \ + debian/tmp/usr/lib/*/$(pkg).so d-shlibmove --commit \ --movedev "debian/tmp/usr/include" usr \ - --movedev "debian/tmp/usr/lib/pkgconfig" usr/share \ - --movedev "debian/tmp/usr/share/gtk-doc/html/gtkdatabox/*" usr/share/doc/libgtkdatabox-0.9.1-1-dev/html \ - debian/tmp/usr/lib/$(pkg).so + --movedev "debian/tmp/usr/lib/*/pkgconfig" usr/share \ + debian/tmp/usr/lib/*/$(pkg).so rm `find debian -name '*.la'` -get-orig-source: - uscan +override_dh_installdocs: + dh_installdocs $(DEB_INSTALL_DOCS_ALL) + # rm -f debian/$(devpkg)/usr/share/doc/$(devpkg)/html/jquery.js + +override_dh_auto_clean: + dh_auto_clean + if [ -d docs/reference.orig ] ; then \ + rm -rf docs/reference ; \ + mv docs/reference.orig docs/reference ; \ + fi + +override_dh_link: + dh_link + dh_link -p$(devpkg) usr/share/doc/$(devpkg)/html usr/share/gtk-doc/html/gtkdatabox -clean:: - rm -f debian/$(devpkg).substvars debian/*.log +get-orig-source: + uscan --verbose --force-download diff -Nru libgtkdatabox-0.9.1.1/debian/source/lintian-overrides libgtkdatabox-0.9.2.0/debian/source/lintian-overrides --- libgtkdatabox-0.9.1.1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/debian/source/lintian-overrides 2013-05-24 06:01:52.000000000 +0000 @@ -0,0 +1,3 @@ +# d-shlibs is requiring "Section: libs" +libgtkdatabox source: binary-control-field-duplicates-source field "section" in package libgtkdatabox* + diff -Nru libgtkdatabox-0.9.1.1/docs/Makefile.am libgtkdatabox-0.9.2.0/docs/Makefile.am --- libgtkdatabox-0.9.1.1/docs/Makefile.am 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# $Id: Makefile.am 4 2008-06-22 09:19:11Z rbock $ - -SUBDIRS = reference - diff -Nru libgtkdatabox-0.9.1.1/docs/Makefile.in libgtkdatabox-0.9.2.0/docs/Makefile.in --- libgtkdatabox-0.9.1.1/docs/Makefile.in 2009-05-11 00:57:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,505 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ - -# $Id: Makefile.am 4 2008-06-22 09:19:11Z rbock $ -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 = docs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.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@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CAIRO_CFLAGS = @CAIRO_CFLAGS@ -CAIRO_LIBS = @CAIRO_LIBS@ -CAIRO_REQUIRED = @CAIRO_REQUIRED@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATABOX_VERSION = @DATABOX_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GLADE3_CFLAGS = @GLADE3_CFLAGS@ -GLADE3_LIBS = @GLADE3_LIBS@ -GREP = @GREP@ -GTKDOC_CHECK = @GTKDOC_CHECK@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HTML_DIR = @HTML_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ -LIBGLADE_LIBS = @LIBGLADE_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PANGO_CFLAGS = @PANGO_CFLAGS@ -PANGO_LIBS = @PANGO_LIBS@ -PANGO_REQUIRED = @PANGO_REQUIRED@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -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_DUMPBIN = @ac_ct_DUMPBIN@ -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@ -glade_catalogdir = @glade_catalogdir@ -glade_moduledir = @glade_moduledir@ -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@ -libglade_moduledir = @libglade_moduledir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -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 = reference -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 docs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/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 - -# 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; nonemtpy = 1; } \ - END { if (nonempty) { 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; nonempty = 1; } \ - END { if (nonempty) { 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=; \ - 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; nonempty = 1; } \ - END { if (nonempty) { 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 -Nru libgtkdatabox-0.9.1.1/docs/reference/Makefile.am libgtkdatabox-0.9.2.0/docs/reference/Makefile.am --- libgtkdatabox-0.9.1.1/docs/reference/Makefile.am 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -# $Id: Makefile.am 4 2008-06-22 09:19:11Z rbock $ - - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE=gtkdatabox - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../gtk - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS= - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS= - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB= -CFILE_GLOB= - -# Header files to ignore when scanning. -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES= - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files= - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files= - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES= `pkg-config gtk+-2.0 --cflags` -GTKDOC_LIBS=@GTK_LIBS@ $(top_builddir)/gtk/libgtkdatabox.la - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += diff -Nru libgtkdatabox-0.9.1.1/docs/reference/Makefile.in libgtkdatabox-0.9.2.0/docs/reference/Makefile.in --- libgtkdatabox-0.9.1.1/docs/reference/Makefile.in 2009-05-11 00:57:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,568 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ - -# $Id: Makefile.am 4 2008-06-22 09:19:11Z rbock $ - -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### -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)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make -subdir = docs/reference -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CAIRO_CFLAGS = @CAIRO_CFLAGS@ -CAIRO_LIBS = @CAIRO_LIBS@ -CAIRO_REQUIRED = @CAIRO_REQUIRED@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATABOX_VERSION = @DATABOX_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GLADE3_CFLAGS = @GLADE3_CFLAGS@ -GLADE3_LIBS = @GLADE3_LIBS@ -GREP = @GREP@ -GTKDOC_CHECK = @GTKDOC_CHECK@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED = @GTK_REQUIRED@ -HTML_DIR = @HTML_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ -LIBGLADE_LIBS = @LIBGLADE_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PANGO_CFLAGS = @PANGO_CFLAGS@ -PANGO_LIBS = @PANGO_LIBS@ -PANGO_REQUIRED = @PANGO_REQUIRED@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -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_DUMPBIN = @ac_ct_DUMPBIN@ -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@ -glade_catalogdir = @glade_catalogdir@ -glade_moduledir = @glade_moduledir@ -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@ -libglade_moduledir = @libglade_moduledir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -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@ - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE = gtkdatabox - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR = ../../gtk - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS = - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS = - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS = --sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS = - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS = - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB = -CFILE_GLOB = - -# Header files to ignore when scanning. -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES = - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES = - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files = - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES = `pkg-config gtk+-2.0 --cflags` -GTKDOC_LIBS = @GTK_LIBS@ $(top_builddir)/gtk/libgtkdatabox.la -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(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/reference/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/reference/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 -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 - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: check-am -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: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -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-local 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-data-local - -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-local - -.MAKE: install-am install-strip - -.PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-local - - -@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp -@ENABLE_GTK_DOC_FALSE@all-local: - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - fi - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi - -.PHONY : dist-hook-local docs -# 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 -Nru libgtkdatabox-0.9.1.1/docs/reference/gtkdatabox-docs.sgml libgtkdatabox-0.9.2.0/docs/reference/gtkdatabox-docs.sgml --- libgtkdatabox-0.9.1.1/docs/reference/gtkdatabox-docs.sgml 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/gtkdatabox-docs.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - GtkDatabox Reference Manual - - - - GtkDatabox - - - - - - - - - - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/gtkdatabox-sections.txt libgtkdatabox-0.9.2.0/docs/reference/gtkdatabox-sections.txt --- libgtkdatabox-0.9.1.1/docs/reference/gtkdatabox-sections.txt 2009-04-19 13:27:47.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/gtkdatabox-sections.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,244 +0,0 @@ -
-gtkdatabox -GtkDataboxPrivate -GtkDatabox -GtkDatabox -gtk_databox_new -gtk_databox_graph_add -gtk_databox_graph_remove -gtk_databox_graph_remove_all -gtk_databox_auto_rescale -gtk_databox_calculate_extrema -gtk_databox_set_total_limits -gtk_databox_set_visible_limits -gtk_databox_get_total_limits -gtk_databox_get_visible_limits -gtk_databox_set_adjustment_x -gtk_databox_set_adjustment_y -gtk_databox_get_adjustment_x -gtk_databox_get_adjustment_y -gtk_databox_set_ruler_x -gtk_databox_set_ruler_y -gtk_databox_get_ruler_x -gtk_databox_get_ruler_y -gtk_databox_set_scale_type_x -gtk_databox_set_scale_type_y -gtk_databox_get_scale_type_x -gtk_databox_get_scale_type_y -gtk_databox_set_enable_selection -gtk_databox_set_enable_zoom -gtk_databox_get_enable_selection -gtk_databox_get_enable_zoom -gtk_databox_zoom_to_selection -gtk_databox_zoom_out -gtk_databox_zoom_home -gtk_databox_value_to_pixel_x -gtk_databox_value_to_pixel_y -gtk_databox_pixel_to_value_x -gtk_databox_pixel_to_value_y -gtk_databox_values_to_pixels -gtk_databox_create_box_with_scrollbars_and_rulers -gtk_databox_get_backing_pixmap - -GTK_DATABOX -GTK_IS_DATABOX -GTK_TYPE_DATABOX -gtk_databox_get_type -GTK_DATABOX_CLASS -GTK_IS_DATABOX_CLASS -GTK_DATABOX_GET_CLASS -
- -
-gtkdatabox_graph -GtkDataboxGraphPrivate -GtkDataboxGraph -GtkDataboxGraph -gtk_databox_graph_get_gc -gtk_databox_graph_set_gc -gtk_databox_graph_set_hide -gtk_databox_graph_get_hide -gtk_databox_graph_set_color -gtk_databox_graph_get_color -gtk_databox_graph_set_size -gtk_databox_graph_get_size -gtk_databox_graph_calculate_extrema -gtk_databox_graph_draw -gtk_databox_graph_create_gc - -GTK_DATABOX_GRAPH -GTK_DATABOX_IS_GRAPH -GTK_DATABOX_TYPE_GRAPH -gtk_databox_graph_get_type -GTK_DATABOX_GRAPH_CLASS -GTK_DATABOX_IS_GRAPH_CLASS -GTK_DATABOX_GRAPH_GET_CLASS -
- -
-gtkdatabox_xyc_graph -GtkDataboxXYCGraphPrivate -GtkDataboxXYCGraph -GtkDataboxXYCGraph -gtk_databox_xyc_graph_get_length -gtk_databox_xyc_graph_get_X -gtk_databox_xyc_graph_get_Y - -GTK_DATABOX_XYC_GRAPH -GTK_DATABOX_IS_XYC_GRAPH -GTK_DATABOX_TYPE_XYC_GRAPH -gtk_databox_xyc_graph_get_type -GTK_DATABOX_XYC_GRAPH_CLASS -GTK_DATABOX_IS_XYC_GRAPH_CLASS -GTK_DATABOX_XYC_GRAPH_GET_CLASS -
- -
-gtkdatabox_points -GtkDataboxPointsPrivate -GtkDataboxPoints -GtkDataboxPoints -gtk_databox_points_new - -GTK_DATABOX_POINTS -GTK_DATABOX_IS_POINTS -GTK_DATABOX_TYPE_POINTS -gtk_databox_points_get_type -GTK_DATABOX_POINTS_CLASS -GTK_DATABOX_IS_POINTS_CLASS -GTK_DATABOX_POINTS_GET_CLASS -
- -
-gtkdatabox_lines -GtkDataboxLinesPrivate -GtkDataboxLines -GtkDataboxLines -gtk_databox_lines_new - -GTK_DATABOX_LINES -GTK_DATABOX_IS_LINES -GTK_DATABOX_TYPE_LINES -gtk_databox_lines_get_type -GTK_DATABOX_LINES_CLASS -GTK_DATABOX_IS_LINES_CLASS -GTK_DATABOX_LINES_GET_CLASS -
- -
-gtkdatabox_bars -GtkDataboxBarsPrivate -GtkDataboxBars -GtkDataboxBars -gtk_databox_bars_new - -GTK_DATABOX_BARS -GTK_DATABOX_IS_BARS -GTK_DATABOX_TYPE_BARS -gtk_databox_bars_get_type -GTK_DATABOX_BARS_CLASS -GTK_DATABOX_IS_BARS_CLASS -GTK_DATABOX_BARS_GET_CLASS -
- -
-gtkdatabox_grid -GtkDataboxGridPrivate -GtkDataboxGrid -GtkDataboxGrid -gtk_databox_grid_new -gtk_databox_grid_array_new -gtk_databox_grid_set_hlines -gtk_databox_grid_get_hlines -gtk_databox_grid_set_vlines -gtk_databox_grid_get_vlines - -GTK_DATABOX_GRID -GTK_DATABOX_IS_GRID -GTK_DATABOX_TYPE_GRID -gtk_databox_grid_get_type -GTK_DATABOX_GRID_CLASS -GTK_DATABOX_IS_GRID_CLASS -GTK_DATABOX_GRID_GET_CLASS -
- -
-gtkdatabox_cross_simple -GtkDataboxCrossSimplePrivate -GtkDataboxCrossSimple -GtkDataboxCrossSimple -gtk_databox_cross_simple_new - -GTK_DATABOX_CROSS_SIMPLE -GTK_DATABOX_IS_CROSS_SIMPLE -GTK_DATABOX_TYPE_CROSS_SIMPLE -gtk_databox_cross_simple_get_type -GTK_DATABOX_CROSS_SIMPLE_CLASS -GTK_DATABOX_IS_CROSS_SIMPLE_CLASS -GTK_DATABOX_CROSS_SIMPLE_GET_CLASS -
- -
-gtkdatabox_ruler -GTK_DATABOX_RULER_MAX_MAX_LENGTH -GtkDataboxRulerPrivate -GtkDataboxRuler -GtkDataboxRuler -gtk_databox_ruler_new -gtk_databox_ruler_set_range -gtk_databox_ruler_set_max_length -gtk_databox_ruler_set_scale_type -gtk_databox_ruler_get_range -gtk_databox_ruler_get_max_length -gtk_databox_ruler_get_scale_type -gtk_databox_ruler_set_orientation -gtk_databox_ruler_get_orientation - -GTK_DATABOX_RULER -GTK_DATABOX_IS_RULER -GTK_DATABOX_TYPE_RULER -gtk_databox_ruler_get_type -GTK_DATABOX_RULER_CLASS -GTK_DATABOX_IS_RULER_CLASS -GTK_DATABOX_RULER_GET_CLASS -
- -
-gtkdatabox_markers -GtkDataboxMarkersPrivate -GtkDataboxMarkersPosition -GtkDataboxMarkersTextPosition -GtkDataboxMarkersType -GtkDataboxMarkers -GtkDataboxMarkers -gtk_databox_markers_new -gtk_databox_markers_set_position -gtk_databox_markers_set_label - -GTK_DATABOX_MARKERS -GTK_DATABOX_IS_MARKERS -GTK_DATABOX_TYPE_MARKERS -gtk_databox_markers_get_type -GTK_DATABOX_MARKERS_CLASS -GTK_DATABOX_IS_MARKERS_CLASS -GTK_DATABOX_MARKERS_GET_CLASS -
- -
-gtkdatabox_marshal -gtk_databox_marshal_VOID__VOID -gtk_databox_marshal_VOID__POINTER -
- -
-gtkdatabox_scale -GtkDataboxScaleType -gtk_databox_scale_type_get_type -
- -
-gtkdatabox_typedefs -GtkDatabox -GtkDataboxGraph -
- diff -Nru libgtkdatabox-0.9.1.1/docs/reference/gtkdatabox.types libgtkdatabox-0.9.2.0/docs/reference/gtkdatabox.types --- libgtkdatabox-0.9.1.1/docs/reference/gtkdatabox.types 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/gtkdatabox.types 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -gtk_databox_get_type -gtk_databox_scale_type_get_type -gtk_databox_graph_get_type -gtk_databox_xyc_graph_get_type -gtk_databox_points_get_type -gtk_databox_lines_get_type -gtk_databox_bars_get_type -gtk_databox_grid_get_type -gtk_databox_cross_simple_get_type -gtk_databox_ruler_get_type -gtk_databox_markers_get_type diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDatabox.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDatabox.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDatabox.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDatabox.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1672 +0,0 @@ - - - - -GtkDatabox - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDatabox

-

GtkDatabox — A GTK+ widget to display large amounts of numerical data quickly and easily.

-
-
-

Synopsis

-
-
-#include <gtkdatabox.h>
-
-                    GtkDataboxPrivate;
-                    GtkDatabox;
-GtkWidget*          gtk_databox_new                     (void);
-gint                gtk_databox_graph_add               (GtkDatabox *box,
-                                                         GtkDataboxGraph *graph);
-gint                gtk_databox_graph_remove            (GtkDatabox *box,
-                                                         GtkDataboxGraph *graph);
-gint                gtk_databox_graph_remove_all        (GtkDatabox *box);
-gint                gtk_databox_auto_rescale            (GtkDatabox *box,
-                                                         gfloat border);
-gint                gtk_databox_calculate_extrema       (GtkDatabox *box,
-                                                         gfloat *min_x,
-                                                         gfloat *max_x,
-                                                         gfloat *min_y,
-                                                         gfloat *max_y);
-void                gtk_databox_set_total_limits        (GtkDatabox *box,
-                                                         gfloat left,
-                                                         gfloat right,
-                                                         gfloat top,
-                                                         gfloat bottom);
-void                gtk_databox_set_visible_limits      (GtkDatabox *box,
-                                                         gfloat left,
-                                                         gfloat right,
-                                                         gfloat top,
-                                                         gfloat bottom);
-void                gtk_databox_get_total_limits        (GtkDatabox *box,
-                                                         gfloat *left,
-                                                         gfloat *right,
-                                                         gfloat *top,
-                                                         gfloat *bottom);
-void                gtk_databox_get_visible_limits      (GtkDatabox *box,
-                                                         gfloat *left,
-                                                         gfloat *right,
-                                                         gfloat *top,
-                                                         gfloat *bottom);
-void                gtk_databox_set_adjustment_x        (GtkDatabox *box,
-                                                         GtkAdjustment *adj);
-void                gtk_databox_set_adjustment_y        (GtkDatabox *box,
-                                                         GtkAdjustment *adj);
-GtkAdjustment*      gtk_databox_get_adjustment_x        (GtkDatabox *box);
-GtkAdjustment*      gtk_databox_get_adjustment_y        (GtkDatabox *box);
-void                gtk_databox_set_ruler_x             (GtkDatabox *box,
-                                                         GtkDataboxRuler *ruler);
-void                gtk_databox_set_ruler_y             (GtkDatabox *box,
-                                                         GtkDataboxRuler *ruler);
-GtkDataboxRuler*    gtk_databox_get_ruler_x             (GtkDatabox *box);
-GtkDataboxRuler*    gtk_databox_get_ruler_y             (GtkDatabox *box);
-void                gtk_databox_set_scale_type_x        (GtkDatabox *box,
-                                                         GtkDataboxScaleType scale_type);
-void                gtk_databox_set_scale_type_y        (GtkDatabox *box,
-                                                         GtkDataboxScaleType scale_type);
-GtkDataboxScaleType gtk_databox_get_scale_type_x        (GtkDatabox *box);
-GtkDataboxScaleType gtk_databox_get_scale_type_y        (GtkDatabox *box);
-void                gtk_databox_set_enable_selection    (GtkDatabox *box,
-                                                         gboolean enable);
-void                gtk_databox_set_enable_zoom         (GtkDatabox *box,
-                                                         gboolean enable);
-gboolean            gtk_databox_get_enable_selection    (GtkDatabox *box);
-gboolean            gtk_databox_get_enable_zoom         (GtkDatabox *box);
-void                gtk_databox_zoom_to_selection       (GtkDatabox *box);
-void                gtk_databox_zoom_out                (GtkDatabox *box);
-void                gtk_databox_zoom_home               (GtkDatabox *box);
-gint16              gtk_databox_value_to_pixel_x        (GtkDatabox *box,
-                                                         gfloat value);
-gint16              gtk_databox_value_to_pixel_y        (GtkDatabox *box,
-                                                         gfloat value);
-gfloat              gtk_databox_pixel_to_value_x        (GtkDatabox *box,
-                                                         gint16 pixel);
-gfloat              gtk_databox_pixel_to_value_y        (GtkDatabox *box,
-                                                         gint16 pixel);
-void                gtk_databox_values_to_pixels        (GtkDatabox *box,
-                                                         guint len,
-                                                         const gfloat *values_x,
-                                                         const gfloat *values_y,
-                                                         GdkPoint *pixels);
-void                gtk_databox_create_box_with_scrollbars_and_rulers
-                                                        (GtkWidget **p_box,
-                                                         GtkWidget **p_table,
-                                                         gboolean scrollbar_x,
-                                                         gboolean scrollbar_y,
-                                                         gboolean ruler_x,
-                                                         gboolean ruler_y);
-GdkPixmap*          gtk_databox_get_backing_pixmap      (GtkDatabox *box);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkDatabox
-
-
-
-

Implemented Interfaces

-

-GtkDatabox implements - AtkImplementorIface and GtkBuildable.

-
-
-

Properties

-
-  "adjustment-x"             GtkAdjustment*        : Read / Write / Construct
-  "adjustment-y"             GtkAdjustment*        : Read / Write / Construct
-  "enable-selection"         gboolean              : Read / Write / Construct
-  "enable-zoom"              gboolean              : Read / Write / Construct
-  "ruler-x"                  GtkDataboxRuler*      : Read / Write / Construct
-  "ruler-y"                  GtkDataboxRuler*      : Read / Write / Construct
-  "scale-type-x"             GtkDataboxScaleType   : Read / Write / Construct
-  "scale-type-y"             GtkDataboxScaleType   : Read / Write / Construct
-
-
-
-

Signals

-
-  "selection-canceled"                             : Run First
-  "selection-changed"                              : Run First
-  "selection-finalized"                            : Run First
-  "selection-started"                              : Run First
-  "zoomed"                                         : Run First
-
-
-
-

Description

-

-GtkDatabox is a widget for the GTK+ library designed to display -large amounts of numerical data quickly and easily. It allows -for one or more data sets of thousands of data points (X and Y coordinates) -to be displayed and updated in split seconds. -

-

-It offers the ability to zoom into and out of the data, and to navigate -through your data by scrolling. -

-

-In addition to rulers and a simple -coordinate cross, it allows you to add one (or even more) configurable grids -like on an oscilloscope. -

-

-Data may be presented as dots, lines connecting the data, -or vertical bars. The widget allows you to easily transform pixel -coordinates into data coordinates, thus allowing you to easily create -powerful applications for data analysis.

-

- -

-
-
-

Details

-
-

GtkDataboxPrivate

-
typedef struct _GtkDataboxPrivate GtkDataboxPrivate;
-

-A private data structure used by the GtkDatabox. It shields all internal things -from developers who are just using the widget.

-

- -

-
-
-
-

GtkDatabox

-
typedef struct _GtkDatabox GtkDatabox;
-

-A GTK+ widget to display large amounts of numerical data quickly and easily. -The numerical data is represented/displayed by GtkDataboxGraph objects, e.g. -GtkDataboxPoints. -

-

-Implemented by _GtkDatabox;

-

- -

-
-- -
-
-
-
-

gtk_databox_new ()

-
GtkWidget*          gtk_databox_new                     (void);
-

-Creates a new GtkDatabox widget.

-

- -

-
-- - - - -

Returns :

 The new GtkDatabox widget. - -
-
-
-
-

gtk_databox_graph_add ()

-
gint                gtk_databox_graph_add               (GtkDatabox *box,
-                                                         GtkDataboxGraph *graph);
-

-Adds the graph to the box. The next time the box is re-drawn, the graph will be shown. -

-

-It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()).

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

graph :

 A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object -

Returns :

 0 on success, -1 otherwise -
-
-
-
-

gtk_databox_graph_remove ()

-
gint                gtk_databox_graph_remove            (GtkDatabox *box,
-                                                         GtkDataboxGraph *graph);
-

-Removes the graph from the box once. The next time the box is re-drawn, the graph will not be shown (unless it was added more -than once).

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

graph :

 A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object -

Returns :

 0 on success, -1 otherwise -
-
-
-
-

gtk_databox_graph_remove_all ()

-
gint                gtk_databox_graph_remove_all        (GtkDatabox *box);
-

-Removes all graphs from the box. The next time the box is re-drawn, no graphs will be shown.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

Returns :

 0 on success, -1 otherwise -
-
-
-
-

gtk_databox_auto_rescale ()

-
gint                gtk_databox_auto_rescale            (GtkDatabox *box,
-                                                         gfloat border);
-

-This function is similar to gtk_databox_set_total_limits(). It sets the total limits -to match the data extrema (see gtk_databox_calculate_extrema()). If you do not like data pixels exactly at the -widget's border, you can add modify the limits using the border parameter: The limits are extended by -border*(max-min) if max!=min. If max==min, they are extended by border*max (otherwise the data could not be -scaled to the pixel realm). -

-

-After calling this function, x values grow from left to right, y values grow from bottom to top.

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

border :

 Relative border width (e.g. 0.1 means that the border on each side is 10% of the data area). -

Returns :

 0 on success, - -1 if box is no GtkDatabox widget, - -2 if no datasets are available -
-
-
-
-

gtk_databox_calculate_extrema ()

-
gint                gtk_databox_calculate_extrema       (GtkDatabox *box,
-                                                         gfloat *min_x,
-                                                         gfloat *max_x,
-                                                         gfloat *min_y,
-                                                         gfloat *max_y);
-

-Determines the minimum and maximum x and y values of all -GtkDataboxGraph objects which have been added to the GtkDatabox widget via gtk_databox_graph_add().

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

min_x :

 Will be filled with the lowest x value of all datasets -

max_x :

 Will be filled with the highest x value of all datasets -

min_y :

 Will be filled with the lowest y value of all datasets -

max_y :

 Will be filled with the highest y value of all datasets -

Returns :

 0 on success, - -1 if box is no GtkDatabox widget, - -2 if no datasets are available -
-
-
-
-

gtk_databox_set_total_limits ()

-
void                gtk_databox_set_total_limits        (GtkDatabox *box,
-                                                         gfloat left,
-                                                         gfloat right,
-                                                         gfloat top,
-                                                         gfloat bottom);
-

-This function is used to set the limits of the total -display area of box. -This function can be used to invert the orientation of the displayed graphs, -e.g. top=-1000 and bottom=0. -

-

-Side effect: The box also internally calls gtk_databox_set_visible_limits() with the same values.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

left :

 Left total limit -

right :

 Right total limit -

top :

 Top total limit -

bottom :

 Bottom total limit -
-
-
-
-

gtk_databox_set_visible_limits ()

-
void                gtk_databox_set_visible_limits      (GtkDatabox *box,
-                                                         gfloat left,
-                                                         gfloat right,
-                                                         gfloat top,
-                                                         gfloat bottom);
-

-This function is used to set the limits of the visible -display area of box. The visible display area can be section of the total -area, i.e. the box zooms in, showing only a part of the complete picture. -

-

-The orientation of the values have to be the same as in gtk_databox_set_total_limits() and -the visible limits have to be within the total limits. The -values will not be used otherwise. -

-

-Side effect: The box emits "zoomed".

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

left :

 Left visible limit -

right :

 Right visible limit -

top :

 Top visible limit -

bottom :

 Bottom visible limit -
-
-
-
-

gtk_databox_get_total_limits ()

-
void                gtk_databox_get_total_limits        (GtkDatabox *box,
-                                                         gfloat *left,
-                                                         gfloat *right,
-                                                         gfloat *top,
-                                                         gfloat *bottom);
-

-Gives the total limits (as set by gtk_databox_auto_rescale() or gtk_databox_set_total_limits()).

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

left :

 Space for total left value or NULL -

right :

 Space for total right value or NULL -

top :

 Space for total top value or NULL -

bottom :

 Space for total bottom value or NULL -
-
-
-
-

gtk_databox_get_visible_limits ()

-
void                gtk_databox_get_visible_limits      (GtkDatabox *box,
-                                                         gfloat *left,
-                                                         gfloat *right,
-                                                         gfloat *top,
-                                                         gfloat *bottom);
-

-Gives the current visible limits. These differ from those given by gtk_databox_get_total_limits() if -you zoomed into the data for instance by gtk_databox_zoom_to_selection() or gtk_databox_set_visible_limits() (these values -can be changed by scrolling, of course).

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

left :

 Space for visible left value or NULL -

right :

 Space for visible right value or NULL -

top :

 Space for visible top value or NULL -

bottom :

 Space for visible bottom value or NULL -
-
-
-
-

gtk_databox_set_adjustment_x ()

-
void                gtk_databox_set_adjustment_x        (GtkDatabox *box,
-                                                         GtkAdjustment *adj);
-

-Setter function for the "adjustment-x" property. Normally, it should not be -required to use this function, see property documentation.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

adj :

 A GtkAdjustment object -
-
-
-
-

gtk_databox_set_adjustment_y ()

-
void                gtk_databox_set_adjustment_y        (GtkDatabox *box,
-                                                         GtkAdjustment *adj);
-

-Setter function for the "adjustment-y" property. Normally, it should not be -required to use this function, see property documentation.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

adj :

 A GtkAdjustment object -
-
-
-
-

gtk_databox_get_adjustment_x ()

-
GtkAdjustment*      gtk_databox_get_adjustment_x        (GtkDatabox *box);
-

-Getter function for the "adjustment-x" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "adjustment-x" property value. - -
-
-
-
-

gtk_databox_get_adjustment_y ()

-
GtkAdjustment*      gtk_databox_get_adjustment_y        (GtkDatabox *box);
-

-Getter function for the "adjustment-y" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "adjustment-y" property value. - -
-
-
-
-

gtk_databox_set_ruler_x ()

-
void                gtk_databox_set_ruler_x             (GtkDatabox *box,
-                                                         GtkDataboxRuler *ruler);
-

-Setter function for the "ruler-x" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

ruler :

 A GtkDataboxRuler object -
-
-
-
-

gtk_databox_set_ruler_y ()

-
void                gtk_databox_set_ruler_y             (GtkDatabox *box,
-                                                         GtkDataboxRuler *ruler);
-

-Setter function for the "ruler-y" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

ruler :

 An GtkDataboxRuler object -
-
-
-
-

gtk_databox_get_ruler_x ()

-
GtkDataboxRuler*    gtk_databox_get_ruler_x             (GtkDatabox *box);
-

-Getter function for the "ruler-x" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "ruler-x" property value. - -
-
-
-
-

gtk_databox_get_ruler_y ()

-
GtkDataboxRuler*    gtk_databox_get_ruler_y             (GtkDatabox *box);
-

-Getter function for the "ruler-y" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "ruler-y" property value. - -
-
-
-
-

gtk_databox_set_scale_type_x ()

-
void                gtk_databox_set_scale_type_x        (GtkDatabox *box,
-                                                         GtkDataboxScaleType scale_type);
-

-Setter function for the "scale-type-x" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

scale_type :

 An GtkDataboxScaleType (linear or logarithmic) -
-
-
-
-

gtk_databox_set_scale_type_y ()

-
void                gtk_databox_set_scale_type_y        (GtkDatabox *box,
-                                                         GtkDataboxScaleType scale_type);
-

-Setter function for the "scale-type-y" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

scale_type :

 An GtkDataboxScaleType (linear or logarithmic) -
-
-
-
-

gtk_databox_get_scale_type_x ()

-
GtkDataboxScaleType gtk_databox_get_scale_type_x        (GtkDatabox *box);
-

-Getter function for the "scale-type-x" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "scale-type-x" property value. - -
-
-
-
-

gtk_databox_get_scale_type_y ()

-
GtkDataboxScaleType gtk_databox_get_scale_type_y        (GtkDatabox *box);
-

-Getter function for the "scale-type-y" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "scale-type-y" property value. - -
-
-
-
-

gtk_databox_set_enable_selection ()

-
void                gtk_databox_set_enable_selection    (GtkDatabox *box,
-                                                         gboolean enable);
-

-Setter function for the "enable-selection" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

enable :

 Whether selection via mouse is enabled or not. -
-
-
-
-

gtk_databox_set_enable_zoom ()

-
void                gtk_databox_set_enable_zoom         (GtkDatabox *box,
-                                                         gboolean enable);
-

-Setter function for the "enable-zoom" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

enable :

 Whether zoom via mouse is enabled or not. -
-
-
-
-

gtk_databox_get_enable_selection ()

-
gboolean            gtk_databox_get_enable_selection    (GtkDatabox *box);
-

-Getter function for the "enable-selection" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "enable-selection" property value. - -
-
-
-
-

gtk_databox_get_enable_zoom ()

-
gboolean            gtk_databox_get_enable_zoom         (GtkDatabox *box);
-

-Getter function for the "enable-zoom" property.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget. -

Returns :

 The "enable-zoom" property value. - -
-
-
-
-

gtk_databox_zoom_to_selection ()

-
void                gtk_databox_zoom_to_selection       (GtkDatabox *box);
-

-This is equivalent to left-clicking into the selected area. -

-

-This function works, if the attribute enable-zoom is set to TRUE. Calling the function -then zooms to the area selected with the mouse. -

-

-Side effect: The box emits "zoomed".

-

- -

-
-- - - - -

box :

 A GtkDatabox widget -
-
-
-
-

gtk_databox_zoom_out ()

-
void                gtk_databox_zoom_out                (GtkDatabox *box);
-

-This is equivalent to right-clicking into the box. -

-

-This function works, if the attribute enable-zoom is set to TRUE. Calling the function -then zooms out by a factor of 2 in both dimensions (the maximum is defined by the total -limits, see gtk_databox_set_total_limits()). -

-

-Side effect: The box emits "zoomed".

-

- -

-
-- - - - -

box :

 A GtkDatabox widget -
-
-
-
-

gtk_databox_zoom_home ()

-
void                gtk_databox_zoom_home               (GtkDatabox *box);
-

-This is equivalent to shift right-clicking into the box. -

-

-This function works, if the attribute enable-zoom is set to TRUE. It is equivalent to -calling the gtk_databox_set_visible_limits() with the total limits.

-

- -

-
-- - - - -

box :

 A GtkDatabox widget -
-
-
-
-

gtk_databox_value_to_pixel_x ()

-
gint16              gtk_databox_value_to_pixel_x        (GtkDatabox *box,
-                                                         gfloat value);
-

-Calculates the horizontal pixel coordinate which represents the x value. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0).

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

value :

 An x value -

Returns :

 Pixel coordinate -
-
-
-
-

gtk_databox_value_to_pixel_y ()

-
gint16              gtk_databox_value_to_pixel_y        (GtkDatabox *box,
-                                                         gfloat value);
-

-Calculates the vertical pixel coordinate which represents the y value. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0).

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

value :

 A y value -

Returns :

 Pixel coordinate -
-
-
-
-

gtk_databox_pixel_to_value_x ()

-
gfloat              gtk_databox_pixel_to_value_x        (GtkDatabox *box,
-                                                         gint16 pixel);
-

-Calculates the x value which is represented by the horizontal pixel coordinate. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0).

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

pixel :

 A horizontal pixel coordinate -

Returns :

 x value -
-
-
-
-

gtk_databox_pixel_to_value_y ()

-
gfloat              gtk_databox_pixel_to_value_y        (GtkDatabox *box,
-                                                         gint16 pixel);
-

-Calculates the y value which is represented by the vertical pixel coordinate. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0).

-

- -

-
-- - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

pixel :

 A vertical pixel coordinate -

Returns :

 y value -
-
-
-
-

gtk_databox_values_to_pixels ()

-
void                gtk_databox_values_to_pixels        (GtkDatabox *box,
-                                                         guint len,
-                                                         const gfloat *values_x,
-                                                         const gfloat *values_y,
-                                                         GdkPoint *pixels);
-

-Calculates the pixel equivalents of the given X/Y values and stores them in the pixels array.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

box :

 A GtkDatabox widget -

len :

 Number of values/pixels -

values_x :

 Array of X values (length >= len) -

values_y :

 Array of Y values (length >= len) -

pixels :

 Array of pixel coordinates (length >= len) -
-
-
-
-

gtk_databox_create_box_with_scrollbars_and_rulers ()

-
void                gtk_databox_create_box_with_scrollbars_and_rulers
-                                                        (GtkWidget **p_box,
-                                                         GtkWidget **p_table,
-                                                         gboolean scrollbar_x,
-                                                         gboolean scrollbar_y,
-                                                         gboolean ruler_x,
-                                                         gboolean ruler_y);
-

-This is a convenience function which creates a GtkDatabox widget in a -GtkTable widget optionally accompanied by scrollbars and rulers. You only -have to fill in the data (gtk_databox_graph_add()) and adjust the limits -(gtk_databox_set_total_limits() or gtk_databox_auto_rescale()). -

-

-see_also: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y()

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

p_box :

 Will contain a pointer to a GtkDatabox widget -

p_table :

 Will contain a pointer to a GtkTable widget -

scrollbar_x :

 Whether to attach a horizontal scrollbar -

scrollbar_y :

 Whether to attach a vertical scrollbar -

ruler_x :

 Whether to attach a horizontal ruler -

ruler_y :

 Whether to attach a vertical ruler -
-
-
-
-

gtk_databox_get_backing_pixmap ()

-
GdkPixmap*          gtk_databox_get_backing_pixmap      (GtkDatabox *box);
-

-This function returns the pixmap which is used by box and its GtkDataboxGraph objects -for drawing operations before copying the result to the screen. -

-

-The function is typically called by the GtkDataboxGraph objects.

-

- -

-
-- - - - - - - - - - -

box :

 A GtkDatabox widget -

Returns :

 Backing pixmap -
-
-
-
-

Property Details

-
-

The "adjustment-x" property

-
  "adjustment-x"             GtkAdjustment*        : Read / Write / Construct
-

GtkAdjustment for horizontal scrolling.

-
-
-
-

The "adjustment-y" property

-
  "adjustment-y"             GtkAdjustment*        : Read / Write / Construct
-

GtkAdjustment for vertical scrolling.

-
-
-
-

The "enable-selection" property

-
  "enable-selection"         gboolean              : Read / Write / Construct
-

-Defines whether the user can select -rectangular areas with the mouse (TRUE) or not (FALSE).

-

- -

-

Default value: TRUE

-
-
-
-

The "enable-zoom" property

-
  "enable-zoom"              gboolean              : Read / Write / Construct
-

-Defines whether the user can use the mouse to zoom in or out (TRUE) or not (FALSE).

-

- -

-

Default value: TRUE

-
-
-
-

The "ruler-x" property

-
  "ruler-x"                  GtkDataboxRuler*      : Read / Write / Construct
-

A horizontal GtkDataboxRuler or NULL.

-
-
-
-

The "ruler-y" property

-
  "ruler-y"                  GtkDataboxRuler*      : Read / Write / Construct
-

A vertical GtkDataboxRuler or NULL.

-
-
-
-

The "scale-type-x" property

-
  "scale-type-x"             GtkDataboxScaleType   : Read / Write / Construct
-

Horizontal scale type (linear or logarithmic).

-

Default value: GTK_DATABOX_SCALE_LINEAR

-
-
-
-

The "scale-type-y" property

-
  "scale-type-y"             GtkDataboxScaleType   : Read / Write / Construct
-

Vertical scale type (linear or logarithmic).

-

Default value: GTK_DATABOX_SCALE_LINEAR

-
-
-
-

Signal Details

-
-

The "selection-canceled" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    user_data)      : Run First
-

-This signal is emitted after a right click outside -a selection rectangle.

-

- -

- -@:
-- - - - - - - - - - -

box :

 The GtkDatabox widget which zoomed in or out. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "selection-changed" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    selection_values,
-                                                        gpointer    user_data)             : Run First
-

-This signal is emitted when the mouse is moved -with the left button pressed (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values.

-

- -

- -@: -@:
-- - - - - - - - - - - - - - -

box :

 The GtkDatabox widget in which the selection was changed. -

selection_values :

 The corners of the selection rectangle. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "selection-finalized" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    selection_values,
-                                                        gpointer    user_data)             : Run First
-

-This signal is emitted when the left mouse button -is released after a selection was started before. -

-

-see_also: "selection-changed"

-

- -

- -@: -@:
-- - - - - - - - - - - - - - -

box :

 The GtkDatabox widget in which the selection has been stopped. -

selection_values :

 The corners of the selection rectangle. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "selection-started" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    selection_values,
-                                                        gpointer    user_data)             : Run First
-

-This signal is emitted when the mouse is firstmoved -with the left button pressed after the mouse-down (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values. -

-

-see_also: "selection-changed"

-

- -

- -@: -@:
-- - - - - - - - - - - - - - -

box :

 The GtkDatabox widget in which the selection has been started. -

selection_values :

 The corners of the selection rectangle. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "zoomed" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    user_data)      : Run First
-

-This signal is emitted each time the zoom of the widget is changed, see for example -gtk_databox_zoom_to_selection(), gtk_databox_set_visible_limits().

-

- -

- -@:
-- - - - - - - - - - -

box :

 The GtkDatabox widget which zoomed in or out. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

See Also

-GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxGrid -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxBars.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxBars.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxBars.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxBars.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ - - - - -GtkDataboxBars - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxBars

-

GtkDataboxBars — A GtkDataboxGraph used for displaying xy-values as vertical bars.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_bars.h>
-
-                    GtkDataboxBarsPrivate;
-                    GtkDataboxBars;
-GtkDataboxGraph*    gtk_databox_bars_new                (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         guint size);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-               +----GtkDataboxBars
-
-
-
-

Description

-

-GtkDataboxBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y=0.

-

- -

-
-
-

Details

-
-

GtkDataboxBarsPrivate

-
typedef struct _GtkDataboxBarsPrivate GtkDataboxBarsPrivate;
-

-A private data structure used by the GtkDataboxBars. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxBars

-
typedef struct _GtkDataboxBars GtkDataboxBars;
-

-GtkDataboxBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y=0.

-

- -

-
-- -
-
-
-
-

gtk_databox_bars_new ()

-
GtkDataboxGraph*    gtk_databox_bars_new                (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         guint size);
-

-Creates a new GtkDataboxBars object which can be added to a GtkDatabox widget

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

len :

 length of X and Y -

X :

 array of horizontal position values of markers -

Y :

 array of vertical position values of markers -

color :

 color of the markers -

size :

 marker size or line width (depending on the type) -

Returns :

 A new GtkDataboxBars object -
-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxCrossSimple.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxCrossSimple.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxCrossSimple.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxCrossSimple.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - - - - -GtkDataboxCrossSimple - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxCrossSimple

-

GtkDataboxCrossSimple — A GtkDataboxGraph used for displaying a simple coordinate cross.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_cross_simple.h>
-
-                    GtkDataboxCrossSimplePrivate;
-                    GtkDataboxCrossSimple;
-GtkDataboxGraph*    gtk_databox_cross_simple_new        (GdkColor *color,
-                                                         guint size);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-               +----GtkDataboxMarkers
-                     +----GtkDataboxCrossSimple
-
-
-
-

Description

-

-GtkDataboxCrossSimple is a GtkDataboxGraph class for displaying a simple coordinate cross (a vertical line -at x=0 and a horizontal line at y=0). -

-

-A more sophisticated coordinate cross would be welcome :-)

-

- -

-
-
-

Details

-
-

GtkDataboxCrossSimplePrivate

-
typedef struct _GtkDataboxCrossSimplePrivate GtkDataboxCrossSimplePrivate;
-

-A private data structure used by the GtkDataboxCrossSimple. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxCrossSimple

-
typedef struct _GtkDataboxCrossSimple GtkDataboxCrossSimple;
-

-GtkDataboxCrossSimple is a GtkDataboxGraph class for displaying a simple coordinate cross (a vertical line -at x=0 and a horizontal line at y=0). -

-

-A more sophisticated coordinate cross would be welcome :-)

-

- -

-
-- -
-
-
-
-

gtk_databox_cross_simple_new ()

-
GtkDataboxGraph*    gtk_databox_cross_simple_new        (GdkColor *color,
-                                                         guint size);
-

-Creates a new GtkDataboxCrossSimple object which can be added to a GtkDatabox widget as nice decoration for other graphs.

-

- -

-
-- - - - - - - - - - - - - - -

color :

 color of the markers -

size :

 marker size or line width (depending on the type) -

Returns :

 A new GtkDataboxCrossSimple object -
-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxGraph.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxGraph.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxGraph.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxGraph.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,507 +0,0 @@ - - - - -GtkDataboxGraph - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxGraph

-

GtkDataboxGraph — An abstract anchestor for all "real" graphs.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_graph.h>
-
-                    GtkDataboxGraphPrivate;
-                    GtkDataboxGraph;
-GdkGC*              gtk_databox_graph_get_gc            (GtkDataboxGraph *graph);
-void                gtk_databox_graph_set_gc            (GtkDataboxGraph *graph,
-                                                         GdkGC *gc);
-void                gtk_databox_graph_set_hide          (GtkDataboxGraph *graph,
-                                                         gboolean hide);
-gboolean            gtk_databox_graph_get_hide          (GtkDataboxGraph *graph);
-void                gtk_databox_graph_set_color         (GtkDataboxGraph *graph,
-                                                         GdkColor *color);
-GdkColor*           gtk_databox_graph_get_color         (GtkDataboxGraph *graph);
-void                gtk_databox_graph_set_size          (GtkDataboxGraph *graph,
-                                                         gint size);
-gint                gtk_databox_graph_get_size          (GtkDataboxGraph *graph);
-gint                gtk_databox_graph_calculate_extrema (GtkDataboxGraph *graph,
-                                                         gfloat *min_x,
-                                                         gfloat *max_x,
-                                                         gfloat *min_y,
-                                                         gfloat *max_y);
-void                gtk_databox_graph_draw              (GtkDataboxGraph *graph,
-                                                         GtkDatabox *box);
-GdkGC*              gtk_databox_graph_create_gc         (GtkDataboxGraph *graph,
-                                                         GtkDatabox *box);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-         +----GtkDataboxGrid
-
-
-
-

Properties

-
-  "color"                    gpointer              : Read / Write
-  "hide"                     gboolean              : Read / Write
-  "size"                     gint                  : Read / Write
-
-
-
-

Description

-

-GtkDataboxGraphs can display data or other things in a GtkDatabox widget. -

-

-This class is just the basic interface. Other graph classes are derived from this -class and implement some real things.

-

- -

-
-
-

Details

-
-

GtkDataboxGraphPrivate

-
typedef struct _GtkDataboxGraphPrivate GtkDataboxGraphPrivate;
-

-A private data structure used by the GtkDataboxGraph. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxGraph

-
typedef struct _GtkDataboxGraph GtkDataboxGraph;
-

-The GtkDataboxGraph is the base class for all kinds of graphs (e.g. lines, points, decorations like coordinate crosses) -to be shown in a GtkDatabox wiget. -

-

-Implemented by _GtkDataboxGraph

-

- -

-
-- -
-
-
-
-

gtk_databox_graph_get_gc ()

-
GdkGC*              gtk_databox_graph_get_gc            (GtkDataboxGraph *graph);
-

-Gets the current graphics context of the graph.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

Returns :

 The current graphics context of the graph. - -
-
-
-
-

gtk_databox_graph_set_gc ()

-
void                gtk_databox_graph_set_gc            (GtkDataboxGraph *graph,
-                                                         GdkGC *gc);
-

-Sets the graphics context which the GtkDataboxGraph object is supposed to be using when drawing itself.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

gc :

 Graphics contex for the graph object -
-
-
-
-

gtk_databox_graph_set_hide ()

-
void                gtk_databox_graph_set_hide          (GtkDataboxGraph *graph,
-                                                         gboolean hide);
-

-Hidden graphs are not shown, when the GtkDatabox containing them is redrawn.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

hide :

 Declares whether should be hidden (true) or not (false). -
-
-
-
-

gtk_databox_graph_get_hide ()

-
gboolean            gtk_databox_graph_get_hide          (GtkDataboxGraph *graph);
-

-Gets the current "hide" status.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

Returns :

 Whether the graph is hidden (true) or not (false). - -
-
-
-
-

gtk_databox_graph_set_color ()

-
void                gtk_databox_graph_set_color         (GtkDataboxGraph *graph,
-                                                         GdkColor *color);
-

-Sets the color which the GtkDataboxGraph object is supposed to be using when drawing itself.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

color :

 Color which is to be used by the graph object -
-
-
-
-

gtk_databox_graph_get_color ()

-
GdkColor*           gtk_databox_graph_get_color         (GtkDataboxGraph *graph);
-

-Gets the current color of the graph elements (e.g. points).

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

Returns :

 The color of the graph. - -
-
-
-
-

gtk_databox_graph_set_size ()

-
void                gtk_databox_graph_set_size          (GtkDataboxGraph *graph,
-                                                         gint size);
-

-Sets the size (e.g. line width) which the GtkDataboxGraph object is supposed to be using when drawing itself.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

size :

 Size of graph elements for the graph object -
-
-
-
-

gtk_databox_graph_get_size ()

-
gint                gtk_databox_graph_get_size          (GtkDataboxGraph *graph);
-

-Gets the size of the graph elements (e.g. the line width).

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

Returns :

 size of the graph elements - -
-
-
-
-

gtk_databox_graph_calculate_extrema ()

-
gint                gtk_databox_graph_calculate_extrema (GtkDataboxGraph *graph,
-                                                         gfloat *min_x,
-                                                         gfloat *max_x,
-                                                         gfloat *min_y,
-                                                         gfloat *max_y);
-

-Virtual function which determines the minimum and maximum x and y values of the values of this -GtkDataboxGraph object if applicable (there are graphs which do -not contain data).

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

min_x :

 Will be filled with the lowest x value of the dataset -

max_x :

 Will be filled with the highest x value of the dataset -

min_y :

 Will be filled with the lowest y value of the dataset -

max_y :

 Will be filled with the highest y value of the dataset -

Returns :

 0 on success, - -1 if no data is available, - -
-
-
-
-

gtk_databox_graph_draw ()

-
void                gtk_databox_graph_draw              (GtkDataboxGraph *graph,
-                                                         GtkDatabox *box);
-

-Virtual function which draws the GtkDataboxGraph on the drawing area of the GtkDatabox object. -

-

-Typically this function is called by GtkDatabox objects.

-

- -

-
-- - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

box :

 A GtkDatabox object -
-
-
-
-

gtk_databox_graph_create_gc ()

-
GdkGC*              gtk_databox_graph_create_gc         (GtkDataboxGraph *graph,
-                                                         GtkDatabox *box);
-

-Virtual function which creates a graphics context for the graph. -

-

-Typically called by derived graph objects when the graphics context is needed for the first time.

-

- -

-
-- - - - - - - - - - - - - - -

graph :

 A GtkDataboxGraph object -

box :

 A GtkDatabox object -

Returns :

 The new graphics context. -
-
-
-
-

Property Details

-
-

The "color" property

-
  "color"                    gpointer              : Read / Write
-

Color of graph.

-
-
-
-

The "hide" property

-
  "hide"                     gboolean              : Read / Write
-

Determine if graph is hidden or not.

-

Default value: FALSE

-
-
-
-

The "size" property

-
  "size"                     gint                  : Read / Write
-

Size of displayed items.

-

Default value: 0

-
-
-
-

See Also

-GtkDatabox, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxGrid, GtkDataboxCrossSimple -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxGrid.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxGrid.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxGrid.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxGrid.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,348 +0,0 @@ - - - - -GtkDataboxGrid - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxGrid

-

GtkDataboxGrid — A GtkDataboxGraph used for displaying a grid (like in an oscilloscope).

-
-
-

Synopsis

-
-
-#include <gtkdatabox_grid.h>
-
-                    GtkDataboxGridPrivate;
-                    GtkDataboxGrid;
-GtkDataboxGraph*    gtk_databox_grid_new                (gint hlines,
-                                                         gint vlines,
-                                                         GdkColor *color,
-                                                         guint size);
-GtkDataboxGraph*    gtk_databox_grid_array_new          (gint hlines,
-                                                         gint vlines,
-                                                         gfloat *hline_vals,
-                                                         gfloat *vline_vals,
-                                                         GdkColor *color,
-                                                         guint size);
-void                gtk_databox_grid_set_hlines         (GtkDataboxGrid *grid,
-                                                         gint hlines);
-gint                gtk_databox_grid_get_hlines         (GtkDataboxGrid *grid);
-void                gtk_databox_grid_set_vlines         (GtkDataboxGrid *grid,
-                                                         gint vlines);
-gint                gtk_databox_grid_get_vlines         (GtkDataboxGrid *grid);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxGrid
-
-
-
-

Properties

-
-  "grid-hlines"              gint                  : Read / Write
-  "grid-vlines"              gint                  : Read / Write
-
-
-
-

Description

-

-GtkDataboxGrid is a GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine -the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data.

-

- -

-
-
-

Details

-
-

GtkDataboxGridPrivate

-
typedef struct _GtkDataboxGridPrivate GtkDataboxGridPrivate;
-

-A private data structure used by the GtkDataboxGrid. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxGrid

-
typedef struct _GtkDataboxGrid GtkDataboxGrid;
-

-GtkDataboxGrid is a GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine -the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data.

-

- -

-
-
-
-

gtk_databox_grid_new ()

-
GtkDataboxGraph*    gtk_databox_grid_new                (gint hlines,
-                                                         gint vlines,
-                                                         GdkColor *color,
-                                                         guint size);
-

-Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

hlines :

 number of horizontal lines in the grid -

vlines :

 number of vertical lines in the grid -

color :

 color of the grid -

size :

 line width of the grid -

Returns :

 A new GtkDataboxGrid object -
-
-
-
-

gtk_databox_grid_array_new ()

-
GtkDataboxGraph*    gtk_databox_grid_array_new          (gint hlines,
-                                                         gint vlines,
-                                                         gfloat *hline_vals,
-                                                         gfloat *vline_vals,
-                                                         GdkColor *color,
-                                                         guint size);
-

-Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

hlines :

 number of horizontal lines in the grid -

vlines :

 number of vertical lines in the grid -

hline_vals :

 a pointer to an array of gfloat horizontal grid coordinate -

vline_vals :

 a pointer to an array of gfloat vertical grid coordinate -

color :

 color of the grid -

size :

 line width of the grid -

Returns :

 A new GtkDataboxGrid object -
-
-
-
-

gtk_databox_grid_set_hlines ()

-
void                gtk_databox_grid_set_hlines         (GtkDataboxGrid *grid,
-                                                         gint hlines);
-

-Sets the number of horizontal lines in the grid.

-

- -

-
-- - - - - - - - - - -

grid :

 a GtkDataboxGrid graph object -

hlines :

 number of vertical lines in the grid -
-
-
-
-

gtk_databox_grid_get_hlines ()

-
gint                gtk_databox_grid_get_hlines         (GtkDataboxGrid *grid);
-

-Gets the number of horizontal lines in the grid.

-

- -

-
-- - - - - - - - - - -

grid :

 a GtkDataboxGrid graph object -

Returns :

 Number of horizontal lines in the grid. -
-
-
-
-

gtk_databox_grid_set_vlines ()

-
void                gtk_databox_grid_set_vlines         (GtkDataboxGrid *grid,
-                                                         gint vlines);
-

-Sets the number of vertical lines in the grid.

-

- -

-
-- - - - - - - - - - -

grid :

 a GtkDataboxGrid graph object -

vlines :

 number of vertical lines in the grid -
-
-
-
-

gtk_databox_grid_get_vlines ()

-
gint                gtk_databox_grid_get_vlines         (GtkDataboxGrid *grid);
-

-Gets the number of vertical lines in the grid.

-

- -

-
-- - - - - - - - - - -

grid :

 a GtkDataboxGrid graph object -

Returns :

 Number of vertical lines in the grid. -
-
-
-
-

Property Details

-
-

The "grid-hlines" property

-
  "grid-hlines"              gint                  : Read / Write
-

Number of horizontal lines.

-

Default value: 0

-
-
-
-

The "grid-vlines" property

-
  "grid-vlines"              gint                  : Read / Write
-

Number of vertical lines.

-

Default value: 0

-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxLines.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxLines.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxLines.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxLines.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ - - - - -GtkDataboxLines - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxLines

-

GtkDataboxLines — A GtkDataboxGraph used for displaying xy-values series of connected lines.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_lines.h>
-
-                    GtkDataboxLinesPrivate;
-                    GtkDataboxLines;
-GtkDataboxGraph*    gtk_databox_lines_new               (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         guint size);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-               +----GtkDataboxLines
-
-
-
-

Description

-

-GtkDataboxLines is a GtkDataboxGraph class for displaying xy-values as series of connected lines.

-

- -

-
-
-

Details

-
-

GtkDataboxLinesPrivate

-
typedef struct _GtkDataboxLinesPrivate GtkDataboxLinesPrivate;
-

-A private data structure used by the GtkDataboxLines. It shields all internal things -from developers who are just using the object.

-

- -

-
-- -
-
-
-
-

GtkDataboxLines

-
typedef struct _GtkDataboxLines GtkDataboxLines;
-

-GtkDataboxLines is a GtkDataboxGraph class for displaying xy-values as series of connected lines.

-

- -

-
-
-
-

gtk_databox_lines_new ()

-
GtkDataboxGraph*    gtk_databox_lines_new               (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         guint size);
-

-Creates a new GtkDataboxLines object which can be added to a GtkDatabox widget.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

len :

 length of X and Y -

X :

 array of horizontal position values of markers -

Y :

 array of vertical position values of markers -

color :

 color of the markers -

size :

 marker size or line width (depending on the type) -

Returns :

 A new GtkDataboxLines object -
-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxBars, GtkDataboxMarkers -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxMarkers.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxMarkers.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxMarkers.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxMarkers.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,437 +0,0 @@ - - - - -GtkDataboxMarkers - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxMarkers

-

GtkDataboxMarkers — A GtkDataboxGraph used for displaying labeled markers for xy-values.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_markers.h>
-
-                    GtkDataboxMarkersPrivate;
-enum                GtkDataboxMarkersPosition;
-enum                GtkDataboxMarkersTextPosition;
-enum                GtkDataboxMarkersType;
-                    GtkDataboxMarkers;
-GtkDataboxGraph*    gtk_databox_markers_new             (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         guint size,
-                                                         GtkDataboxMarkersType type);
-void                gtk_databox_markers_set_position    (GtkDataboxMarkers *markers,
-                                                         guint index,
-                                                         GtkDataboxMarkersPosition position);
-void                gtk_databox_markers_set_label       (GtkDataboxMarkers *markers,
-                                                         guint index,
-                                                         GtkDataboxMarkersTextPosition label_position,
-                                                         gchar *text,
-                                                         gboolean boxed);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-               +----GtkDataboxMarkers
-                     +----GtkDataboxCrossSimple
-
-
-
-

Properties

-
-  "markers-type"             gint                  : Read / Write / Construct
-
-
-
-

Description

-

-GtkDataboxMarkers is a GtkDataboxGraph class for displaying labeled markers (circles, triangles, lines) for xy-values.

-

- -

-
-
-

Details

-
-

GtkDataboxMarkersPrivate

-
typedef struct _GtkDataboxMarkersPrivate GtkDataboxMarkersPrivate;
-

-A private data structure used by the GtkDataboxMarkers. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

enum GtkDataboxMarkersPosition

-
   typedef enum
-   {
-      GTK_DATABOX_MARKERS_C = 0,
-      GTK_DATABOX_MARKERS_N,
-      GTK_DATABOX_MARKERS_E,
-      GTK_DATABOX_MARKERS_S,
-      GTK_DATABOX_MARKERS_W
-   }
-   GtkDataboxMarkersPosition;
-
-

-Position of a marker relative to its respective X/Y value.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

GTK_DATABOX_MARKERS_C

 centered on data -

GTK_DATABOX_MARKERS_N

 marker is positioned north of data -

GTK_DATABOX_MARKERS_E

 marker is positioned east of data -

GTK_DATABOX_MARKERS_S

 marker is positioned south of data -

GTK_DATABOX_MARKERS_W

 marker is positioned west of data -
-
-
-
-

enum GtkDataboxMarkersTextPosition

-
   typedef enum
-   {
-      GTK_DATABOX_MARKERS_TEXT_CENTER = 0,/* text centered   on marker */
-      GTK_DATABOX_MARKERS_TEXT_N,	  /* text north      of marker */
-      GTK_DATABOX_MARKERS_TEXT_NE,	  /* text north-east of marker */
-      GTK_DATABOX_MARKERS_TEXT_E,	  /* text east       of marker */
-      GTK_DATABOX_MARKERS_TEXT_SE,	  /* text south-east of marker */
-      GTK_DATABOX_MARKERS_TEXT_S,	  /* text south      of marker */
-      GTK_DATABOX_MARKERS_TEXT_SW,	  /* text south-west of marker */
-      GTK_DATABOX_MARKERS_TEXT_W,	  /* text west       of marker */
-      GTK_DATABOX_MARKERS_TEXT_NW	  /* text north-west of marker */
-   }
-   GtkDataboxMarkersTextPosition;
-
-

-Position of a label relative to its repective marker.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

GTK_DATABOX_MARKERS_TEXT_CENTER

 text centered on marker -

GTK_DATABOX_MARKERS_TEXT_N

 text north of marker -

GTK_DATABOX_MARKERS_TEXT_NE

 text north-east of marker -

GTK_DATABOX_MARKERS_TEXT_E

 text east of marker -

GTK_DATABOX_MARKERS_TEXT_SE

 text south-east of marker -

GTK_DATABOX_MARKERS_TEXT_S

 text south of marker -

GTK_DATABOX_MARKERS_TEXT_SW

 text south-west of marker -

GTK_DATABOX_MARKERS_TEXT_W

 text west of marker -

GTK_DATABOX_MARKERS_TEXT_NW

 text north-west of marker -
-
-
-
-

enum GtkDataboxMarkersType

-
   typedef enum
-   {
-      GTK_DATABOX_MARKERS_NONE = 0,	/* No Marker (just text) */
-      GTK_DATABOX_MARKERS_TRIANGLE,	/* Marker is a triangle */
-      GTK_DATABOX_MARKERS_SOLID_LINE,	/* Marker is a solid line */
-      GTK_DATABOX_MARKERS_DASHED_LINE	/* Marker is a dashed line */
-   }
-   GtkDataboxMarkersType;
-
-

-Type of the marker

-

- -

-
-- - - - - - - - - - - - - - - - - - -

GTK_DATABOX_MARKERS_NONE

 No Marker (just text) -

GTK_DATABOX_MARKERS_TRIANGLE

 Marker is a triangle -

GTK_DATABOX_MARKERS_SOLID_LINE

 Marker is a solid line -

GTK_DATABOX_MARKERS_DASHED_LINE

 Marker is a dashed line -
-
-
-
-

GtkDataboxMarkers

-
typedef struct _GtkDataboxMarkers GtkDataboxMarkers;
-

-GtkDataboxMarkers is a GtkDataboxGraph class for displaying labeled markers (circles, triangles, lines) for xy-values.

-

- -

-
-- -
-
-
-
-

gtk_databox_markers_new ()

-
GtkDataboxGraph*    gtk_databox_markers_new             (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         guint size,
-                                                         GtkDataboxMarkersType type);
-

-Creates a new GtkDataboxMarkers object which can be added to a GtkDatabox widget as nice decoration for other graphs.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

len :

 length of X and Y -

X :

 array of horizontal position values of markers -

Y :

 array of vertical position values of markers -

color :

 color of the markers -

size :

 marker size or line width (depending on the type) -

type :

 type of markers (e.g. triangle or circle) -

Returns :

 A new GtkDataboxMarkers object -
-
-
-
-

gtk_databox_markers_set_position ()

-
void                gtk_databox_markers_set_position    (GtkDataboxMarkers *markers,
-                                                         guint index,
-                                                         GtkDataboxMarkersPosition position);
-

-Sets a position for one of the markers.

-

- -

-
-- - - - - - - - - - - - - - -

markers :

 A GtkDataboxMarkers object -

index :

 index within the array of X/Y values -

position :

 position of the marker (e.g. circle or triangle relative to their X/Y value -
-
-
-
-

gtk_databox_markers_set_label ()

-
void                gtk_databox_markers_set_label       (GtkDataboxMarkers *markers,
-                                                         guint index,
-                                                         GtkDataboxMarkersTextPosition label_position,
-                                                         gchar *text,
-                                                         gboolean boxed);
-

-Sets a label for one of the markers.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -

markers :

 A GtkDataboxMarkers object -

index :

 index within the array of X/Y values -

label_position :

 position of the label relative to the marker -

text :

 text to be displayed in the label -

boxed :

 Whether the label is to be enclosed in a box (true) or not (false) -
-
-
-
-

Property Details

-
-

The "markers-type" property

-
  "markers-type"             gint                  : Read / Write / Construct
-

Type of markers for this graph, e.g. triangles or lines.

-

Default value: 0

-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxPoints.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxPoints.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxPoints.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxPoints.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ - - - - -GtkDataboxPoints - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxPoints

-

GtkDataboxPoints — A GtkDataboxGraph used for displaying xy-values as dots.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_points.h>
-
-                    GtkDataboxPointsPrivate;
-                    GtkDataboxPoints;
-GtkDataboxGraph*    gtk_databox_points_new              (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         gint size);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-               +----GtkDataboxPoints
-
-
-
-

Description

-

-GtkDataboxPoints is a GtkDataboxGraph class for displaying xy-values as dots.

-

- -

-
-
-

Details

-
-

GtkDataboxPointsPrivate

-
typedef struct _GtkDataboxPointsPrivate GtkDataboxPointsPrivate;
-

-A private data structure used by the GtkDataboxPoints. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxPoints

-
typedef struct _GtkDataboxPoints GtkDataboxPoints;
-

-GtkDataboxPoints is a GtkDataboxGraph class for displaying xy-values as dots.

-

- -

-
-- -
-
-
-
-

gtk_databox_points_new ()

-
GtkDataboxGraph*    gtk_databox_points_new              (guint len,
-                                                         gfloat *X,
-                                                         gfloat *Y,
-                                                         GdkColor *color,
-                                                         gint size);
-

-Creates a new GtkDataboxPoints object which can be added to a GtkDatabox widget.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

len :

 length of X and Y -

X :

 array of horizontal position values of markers -

Y :

 array of vertical position values of markers -

color :

 color of the markers -

size :

 marker size or line width (depending on the type) -

Returns :

 A new GtkDataboxPoints object -
-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxRuler.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxRuler.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxRuler.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxRuler.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,496 +0,0 @@ - - - - -GtkDataboxRuler - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxRuler

-

GtkDataboxRuler — An improved version of the GtkRuler.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_ruler.h>
-
-#define             GTK_DATABOX_RULER_MAX_MAX_LENGTH
-                    GtkDataboxRulerPrivate;
-                    GtkDataboxRuler;
-GtkWidget*          gtk_databox_ruler_new               (GtkOrientation orientation);
-void                gtk_databox_ruler_set_range         (GtkDataboxRuler *ruler,
-                                                         gdouble lower,
-                                                         gdouble upper,
-                                                         gdouble position);
-void                gtk_databox_ruler_set_max_length    (GtkDataboxRuler *ruler,
-                                                         guint max_length);
-void                gtk_databox_ruler_set_scale_type    (GtkDataboxRuler *ruler,
-                                                         guint scale_type);
-void                gtk_databox_ruler_get_range         (GtkDataboxRuler *ruler,
-                                                         gdouble *lower,
-                                                         gdouble *upper,
-                                                         gdouble *position);
-guint               gtk_databox_ruler_get_max_length    (GtkDataboxRuler *ruler);
-GtkDataboxScaleType gtk_databox_ruler_get_scale_type    (GtkDataboxRuler *ruler);
-void                gtk_databox_ruler_set_orientation   (GtkDataboxRuler *ruler,
-                                                         GtkOrientation orientation);
-GtkOrientation      gtk_databox_ruler_get_orientation   (GtkDataboxRuler *ruler);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkDataboxRuler
-
-
-
-

Implemented Interfaces

-

-GtkDataboxRuler implements - AtkImplementorIface and GtkBuildable.

-
-
-

Properties

-
-  "lower"                    gdouble               : Read / Write
-  "max-length"               guint                 : Read / Write
-  "orientation"              guint                 : Read / Write / Construct Only
-  "position"                 gdouble               : Read / Write
-  "upper"                    gdouble               : Read / Write
-
-
-
-

Description

-

-GtkDataboxRuler is a widget for the GTK+ library similar to GtkRuler. -

-

-It is improved in several ways: -

-

-

-
    -

  • - It supports linear and logarithmic scales. -

    • -

  • - In the vertical orientation, the labels are rotated 90° (instead of being written - as a vertical column of horizontal characters). This increases readability. -

    • -

  • - It works for very small and very large value ranges. -

    • -
-

- -

-
-
-

Details

-
-

GTK_DATABOX_RULER_MAX_MAX_LENGTH

-
#define GTK_DATABOX_RULER_MAX_MAX_LENGTH 63
-
-

-The maximum upper limit of label length in characters

-

- -

-
-
-
-

GtkDataboxRulerPrivate

-
typedef struct _GtkDataboxRulerPrivate GtkDataboxRulerPrivate;
-

-A private data structure used by the GtkDataboxRuler. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxRuler

-
typedef struct _GtkDataboxRuler GtkDataboxRuler;
-

-An improved version (see above) of GtkRuler which supports linear and logarithmic scales.

-

- -

-
-
-
-

gtk_databox_ruler_new ()

-
GtkWidget*          gtk_databox_ruler_new               (GtkOrientation orientation);
-

-Creates a new GtkDataboxRuler widget with the given orientation (horizontal or vertical).

-

- -

-
-- - - - - - - - - - -

orientation :

 orientation of the ruler -

Returns :

 A new GtkDataboxRuler -
-
-
-
-

gtk_databox_ruler_set_range ()

-
void                gtk_databox_ruler_set_range         (GtkDataboxRuler *ruler,
-                                                         gdouble lower,
-                                                         gdouble upper,
-                                                         gdouble position);
-

-Sets values indicating the range and current position of a GtkDataboxRuler. -

-

-See gtk_databox_ruler_get_range().

-

- -

-
-- - - - - - - - - - - - - - - - - - -

ruler :

 a GtkDataboxRuler -

lower :

 lower limit of the ruler -

upper :

 upper limit of the ruler -

position :

 current position of the mark on the ruler -
-
-
-
-

gtk_databox_ruler_set_max_length ()

-
void                gtk_databox_ruler_set_max_length    (GtkDataboxRuler *ruler,
-                                                         guint max_length);
-

-This function sets the maximum number of digits to be used for each tick -label of the ruler. -

-

-The max_length cannot be smaller than 2 and not bigger than -GTK_DATABOX_RULER_MAX_MAX_LENGTH.

-

- -

-
-- - - - - - - - - - -

ruler :

 A GtkDataboxRuler widget -

max_length :

 Maximum length (digits) of tick labels -
-
-
-
-

gtk_databox_ruler_set_scale_type ()

-
void                gtk_databox_ruler_set_scale_type    (GtkDataboxRuler *ruler,
-                                                         guint scale_type);
-

-This function sets the scale type of the ruler.

-

- -

-
-- - - - - - - - - - -

ruler :

 A GtkDataboxRuler widget -

scale_type :

 The new scale type for ruler (linear or logarithmic) -
-
-
-
-

gtk_databox_ruler_get_range ()

-
void                gtk_databox_ruler_get_range         (GtkDataboxRuler *ruler,
-                                                         gdouble *lower,
-                                                         gdouble *upper,
-                                                         gdouble *position);
-

-Retrieves values indicating the range and current position of a GtkDataboxRuler. -See gtk_databox_ruler_set_range().

-

- -

-
-- - - - - - - - - - - - - - - - - - -

ruler :

 a GtkDataboxRuler -

lower :

 location to store lower limit of the ruler, or NULL -

upper :

 location to store upper limit of the ruler, or NULL -

position :

 location to store the current position of the mark on the ruler, or NULL -
-
-
-
-

gtk_databox_ruler_get_max_length ()

-
guint               gtk_databox_ruler_get_max_length    (GtkDataboxRuler *ruler);
-

-This function returns the maximum number of digits to be used for each tick -label of the ruler.

-

- -

-
-- - - - - - - - - - -

ruler :

 A GtkDataboxRuler widget -

Returns :

 The maximum length of the tick labels. - -
-
-
-
-

gtk_databox_ruler_get_scale_type ()

-
GtkDataboxScaleType gtk_databox_ruler_get_scale_type    (GtkDataboxRuler *ruler);
-

-This function returns the scale type of the ruler (linear or logarithmic).

-

- -

-
-- - - - - - - - - - -

ruler :

 A GtkDataboxRuler widget -

Returns :

 The scale type (linear or logarithmic) - -
-
-
-
-

gtk_databox_ruler_set_orientation ()

-
void                gtk_databox_ruler_set_orientation   (GtkDataboxRuler *ruler,
-                                                         GtkOrientation orientation);
-

-Sets the orientation of the ruler (horizontal or vertical).

-

- -

-
-- - - - - - - - - - -

ruler :

 a GtkDataboxRuler -

orientation :

 new orientation of the ruler -
-
-
-
-

gtk_databox_ruler_get_orientation ()

-
GtkOrientation      gtk_databox_ruler_get_orientation   (GtkDataboxRuler *ruler);
-

-Gets the orientation of the ruler (horizontal or vertical).

-

- -

-
-- - - - - - - - - - -

ruler :

 a GtkDataboxRuler -

Returns :

 Orientation of the ruler. -
-
-
-
-

Property Details

-
-

The "lower" property

-
  "lower"                    gdouble               : Read / Write
-

Lower limit of ruler.

-

Default value: 0

-
-
-
-

The "max-length" property

-
  "max-length"               guint                 : Read / Write
-

Maximum length of the labels (in digits).

-

Allowed values: [2,63]

-

Default value: 6

-
-
-
-

The "orientation" property

-
  "orientation"              guint                 : Read / Write / Construct Only
-

Orientation of the ruler: horizontal or vertical.

-

Allowed values: <= 1

-

Default value: 0

-
-
-
-

The "position" property

-
  "position"                 gdouble               : Read / Write
-

Position of mark on the ruler.

-

Default value: 0

-
-
-
-

The "upper" property

-
  "upper"                    gdouble               : Read / Write
-

Upper limit of ruler.

-

Default value: 0

-
-
-
-

See Also

-GtkDatabox -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxXYCGraph.html libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxXYCGraph.html --- libgtkdatabox-0.9.1.1/docs/reference/html/GtkDataboxXYCGraph.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/GtkDataboxXYCGraph.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,214 +0,0 @@ - - - - -GtkDataboxXYCGraph - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

GtkDataboxXYCGraph

-

GtkDataboxXYCGraph — An abstract anchestor for all graphs which display xy-values in one color.

-
-
-

Synopsis

-
-
-#include <gtkdatabox_xyc_graph.h>
-
-                    GtkDataboxXYCGraphPrivate;
-                    GtkDataboxXYCGraph;
-guint               gtk_databox_xyc_graph_get_length    (GtkDataboxXYCGraph *xyc_graph);
-gfloat*             gtk_databox_xyc_graph_get_X         (GtkDataboxXYCGraph *xyc_graph);
-gfloat*             gtk_databox_xyc_graph_get_Y         (GtkDataboxXYCGraph *xyc_graph);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-               +----GtkDataboxPoints
-               +----GtkDataboxLines
-               +----GtkDataboxBars
-               +----GtkDataboxMarkers
-
-
-
-

Properties

-
-  "X-Values"                 gpointer              : Read / Write / Construct Only
-  "Y-Values"                 gpointer              : Read / Write / Construct Only
-  "length"                   gint                  : Read / Write / Construct Only
-
-
-
-

Description

-

-GtkDataboxXYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented -as an array of X values and a second array of Y values. In order to actually display data, you should -use one of the derived classes.

-

- -

-
-
-

Details

-
-

GtkDataboxXYCGraphPrivate

-
typedef struct _GtkDataboxXYCGraphPrivate GtkDataboxXYCGraphPrivate;
-

-A private data structure used by the GtkDataboxXYCGraph. It shields all internal things -from developers who are just using the object.

-

- -

-
-
-
-

GtkDataboxXYCGraph

-
typedef struct _GtkDataboxXYCGraph GtkDataboxXYCGraph;
-

-GtkDataboxXYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented -as an array of X values and a second array of Y values. In order to actually display data, you should -use one of the derived classes.

-

- -

-
-
-
-

gtk_databox_xyc_graph_get_length ()

-
guint               gtk_databox_xyc_graph_get_length    (GtkDataboxXYCGraph *xyc_graph);
-

-Gets the the length of the X and Y values arrays.

-

- -

-
-- - - - - - - - - - -

xyc_graph :

 A GtkDataboxXYCGraph object -

Returns :

 Length of X/Y arrays. -
-
-
-
-

gtk_databox_xyc_graph_get_X ()

-
gfloat*             gtk_databox_xyc_graph_get_X         (GtkDataboxXYCGraph *xyc_graph);
-

-Gets the X values of the xzc_graph.

-

- -

-
-- - - - - - - - - - -

xyc_graph :

 A GtkDataboxXYCGraph object -

Returns :

 Pointer to X values -
-
-
-
-

gtk_databox_xyc_graph_get_Y ()

-
gfloat*             gtk_databox_xyc_graph_get_Y         (GtkDataboxXYCGraph *xyc_graph);
-

-Gets the Y values of the xzc_graph.

-

- -

-
-- - - - - - - - - - -

xyc_graph :

 A GtkDataboxXYCGraph object -

Returns :

 Pointer to Y values -
-
-
-
-

Property Details

-
-

The "X-Values" property

-
  "X-Values"                 gpointer              : Read / Write / Construct Only
-

X values of data.

-
-
-
-

The "Y-Values" property

-
  "Y-Values"                 gpointer              : Read / Write / Construct Only
-

Y values of data.

-
-
-
-

The "length" property

-
  "length"                   gint                  : Read / Write / Construct Only
-

number of data points.

-

Default value: 0

-
-
-
-

See Also

-GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars -
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/ch01.html libgtkdatabox-0.9.2.0/docs/reference/html/ch01.html --- libgtkdatabox-0.9.1.1/docs/reference/html/ch01.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/ch01.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ - - - - -GtkDatabox - - - - - - - - - - - - - - - - - -
-

-GtkDatabox

-
-
-GtkDatabox — A GTK+ widget to display large amounts of numerical data quickly and easily. -
-
-GtkDataboxGraph — An abstract anchestor for all "real" graphs. -
-
-GtkDataboxXYCGraph — An abstract anchestor for all graphs which display xy-values in one color. -
-
-GtkDataboxPoints — A GtkDataboxGraph used for displaying xy-values as dots. -
-
-GtkDataboxLines — A GtkDataboxGraph used for displaying xy-values series of connected lines. -
-
-GtkDataboxBars — A GtkDataboxGraph used for displaying xy-values as vertical bars. -
-
-GtkDataboxGrid — A GtkDataboxGraph used for displaying a grid (like in an oscilloscope). -
-
-GtkDataboxCrossSimple — A GtkDataboxGraph used for displaying a simple coordinate cross. -
-
-GtkDataboxRuler — An improved version of the GtkRuler. -
-
-GtkDataboxMarkers — A GtkDataboxGraph used for displaying labeled markers for xy-values. -
-
-gtkdatabox_marshal -
-
-gtkdatabox_scale -
-
-gtkdatabox_typedefs -
-
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox-gtkdatabox-marshal.html libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox-gtkdatabox-marshal.html --- libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox-gtkdatabox-marshal.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox-gtkdatabox-marshal.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ - - - - -gtkdatabox_marshal - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

gtkdatabox_marshal

-

gtkdatabox_marshal

-
-
-

Synopsis

-
-#define             gtk_databox_marshal_VOID__VOID
-#define             gtk_databox_marshal_VOID__POINTER
-
-
-
-

Description

-

- -

-
-
-

Details

-
-

gtk_databox_marshal_VOID__VOID

-
#define gtk_databox_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
-
-

- -

-
-
-
-

gtk_databox_marshal_VOID__POINTER

-
#define gtk_databox_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-
-

- -

-
-
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox-gtkdatabox-scale.html libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox-gtkdatabox-scale.html --- libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox-gtkdatabox-scale.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox-gtkdatabox-scale.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ - - - - -gtkdatabox_scale - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

gtkdatabox_scale

-

gtkdatabox_scale

-
-
-

Synopsis

-
-enum                GtkDataboxScaleType;
-GType               gtk_databox_scale_type_get_type     (void);
-
-
-
-

Description

-

- -

-
-
-

Details

-
-

enum GtkDataboxScaleType

-
typedef enum
-{
-   GTK_DATABOX_SCALE_LINEAR = 0,
-   GTK_DATABOX_SCALE_LOG2,
-   GTK_DATABOX_SCALE_LOG
-}
-GtkDataboxScaleType;
-
-

-Scale type for GtkDatabox and GtkDataboxRuler objects. -

-

-See also: "scale_type_x", "scale_type_y"

-

- -

-
-- - - - - - - - - - - - - - -

GTK_DATABOX_SCALE_LINEAR

 Linear scale -

GTK_DATABOX_SCALE_LOG2

 -

GTK_DATABOX_SCALE_LOG

 Logarithmic scale (base 10) -
-
-
-
-

gtk_databox_scale_type_get_type ()

-
GType               gtk_databox_scale_type_get_type     (void);
-

- -

-
-- - - - -

Returns :

 - - -
-
-
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox-gtkdatabox-typedefs.html libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox-gtkdatabox-typedefs.html --- libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox-gtkdatabox-typedefs.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox-gtkdatabox-typedefs.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,404 +0,0 @@ - - - - -gtkdatabox_typedefs - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

gtkdatabox_typedefs

-

gtkdatabox_typedefs

-
-
-

Synopsis

-
-                    GtkDatabox;
-                    GtkDataboxGraph;
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkDatabox
-
-
-  GObject
-   +----GtkDataboxGraph
-         +----GtkDataboxXYCGraph
-         +----GtkDataboxGrid
-
-
-
-

Implemented Interfaces

-

-GtkDatabox implements - AtkImplementorIface and GtkBuildable.

-
-
-

Properties

-
-  "adjustment-x"             GtkAdjustment*        : Read / Write / Construct
-  "adjustment-y"             GtkAdjustment*        : Read / Write / Construct
-  "enable-selection"         gboolean              : Read / Write / Construct
-  "enable-zoom"              gboolean              : Read / Write / Construct
-  "ruler-x"                  GtkDataboxRuler*      : Read / Write / Construct
-  "ruler-y"                  GtkDataboxRuler*      : Read / Write / Construct
-  "scale-type-x"             GtkDataboxScaleType   : Read / Write / Construct
-  "scale-type-y"             GtkDataboxScaleType   : Read / Write / Construct
-  "color"                    gpointer              : Read / Write
-  "hide"                     gboolean              : Read / Write
-  "size"                     gint                  : Read / Write
-
-
-
-

Signals

-
-  "selection-canceled"                             : Run First
-  "selection-changed"                              : Run First
-  "selection-finalized"                            : Run First
-  "selection-started"                              : Run First
-  "zoomed"                                         : Run First
-
-
-
-

Description

-

- -

-
-
-

Details

-
-

GtkDatabox

-
typedef struct _GtkDatabox GtkDatabox;
-

-A GTK+ widget to display large amounts of numerical data quickly and easily. -The numerical data is represented/displayed by GtkDataboxGraph objects, e.g. -GtkDataboxPoints. -

-

-Implemented by _GtkDatabox;

-

- -

-
-- -
-
-
-
-

GtkDataboxGraph

-
typedef struct _GtkDataboxGraph GtkDataboxGraph;
-

-The GtkDataboxGraph is the base class for all kinds of graphs (e.g. lines, points, decorations like coordinate crosses) -to be shown in a GtkDatabox wiget. -

-

-Implemented by _GtkDataboxGraph

-

- -

-
-- -
-
-
-
-

Property Details

-
-

The "adjustment-x" property

-
  "adjustment-x"             GtkAdjustment*        : Read / Write / Construct
-

GtkAdjustment for horizontal scrolling.

-
-
-
-

The "adjustment-y" property

-
  "adjustment-y"             GtkAdjustment*        : Read / Write / Construct
-

GtkAdjustment for vertical scrolling.

-
-
-
-

The "enable-selection" property

-
  "enable-selection"         gboolean              : Read / Write / Construct
-

-Defines whether the user can select -rectangular areas with the mouse (TRUE) or not (FALSE).

-

- -

-

Default value: TRUE

-
-
-
-

The "enable-zoom" property

-
  "enable-zoom"              gboolean              : Read / Write / Construct
-

-Defines whether the user can use the mouse to zoom in or out (TRUE) or not (FALSE).

-

- -

-

Default value: TRUE

-
-
-
-

The "ruler-x" property

-
  "ruler-x"                  GtkDataboxRuler*      : Read / Write / Construct
-

A horizontal GtkDataboxRuler or NULL.

-
-
-
-

The "ruler-y" property

-
  "ruler-y"                  GtkDataboxRuler*      : Read / Write / Construct
-

A vertical GtkDataboxRuler or NULL.

-
-
-
-

The "scale-type-x" property

-
  "scale-type-x"             GtkDataboxScaleType   : Read / Write / Construct
-

Horizontal scale type (linear or logarithmic).

-

Default value: GTK_DATABOX_SCALE_LINEAR

-
-
-
-

The "scale-type-y" property

-
  "scale-type-y"             GtkDataboxScaleType   : Read / Write / Construct
-

Vertical scale type (linear or logarithmic).

-

Default value: GTK_DATABOX_SCALE_LINEAR

-
-
-
-

The "color" property

-
  "color"                    gpointer              : Read / Write
-

Color of graph.

-
-
-
-

The "hide" property

-
  "hide"                     gboolean              : Read / Write
-

Determine if graph is hidden or not.

-

Default value: FALSE

-
-
-
-

The "size" property

-
  "size"                     gint                  : Read / Write
-

Size of displayed items.

-

Default value: 0

-
-
-
-

Signal Details

-
-

The "selection-canceled" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    user_data)      : Run First
-

-This signal is emitted after a right click outside -a selection rectangle.

-

- -

-
-- - - - - - - - - - -

box :

 The GtkDatabox widget which zoomed in or out. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "selection-changed" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    selection_values,
-                                                        gpointer    user_data)             : Run First
-

-This signal is emitted when the mouse is moved -with the left button pressed (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values.

-

- -

-
-- - - - - - - - - - - - - - -

box :

 The GtkDatabox widget in which the selection was changed. -

selection_values :

 The corners of the selection rectangle. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "selection-finalized" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    selection_values,
-                                                        gpointer    user_data)             : Run First
-

-This signal is emitted when the left mouse button -is released after a selection was started before. -

-

-see_also: "selection-changed"

-

- -

-
-- - - - - - - - - - - - - - -

box :

 The GtkDatabox widget in which the selection has been stopped. -

selection_values :

 The corners of the selection rectangle. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "selection-started" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    selection_values,
-                                                        gpointer    user_data)             : Run First
-

-This signal is emitted when the mouse is firstmoved -with the left button pressed after the mouse-down (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values. -

-

-see_also: "selection-changed"

-

- -

-
-- - - - - - - - - - - - - - -

box :

 The GtkDatabox widget in which the selection has been started. -

selection_values :

 The corners of the selection rectangle. -

user_data :

user data set when the signal handler was connected.
-
-
-
-

The "zoomed" signal

-
void                user_function                      (GtkDatabox *box,
-                                                        gpointer    user_data)      : Run First
-

-This signal is emitted each time the zoom of the widget is changed, see for example -gtk_databox_zoom_to_selection(), gtk_databox_set_visible_limits().

-

- -

-
-- - - - - - - - - - -

box :

 The GtkDatabox widget which zoomed in or out. -

user_data :

user data set when the signal handler was connected.
-
-
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox.devhelp libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox.devhelp --- libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox.devhelp 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox.devhelp 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox.devhelp2 libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox.devhelp2 --- libgtkdatabox-0.9.1.1/docs/reference/html/gtkdatabox.devhelp2 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/gtkdatabox.devhelp2 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/docs/reference/html/home.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/docs/reference/html/home.png differ diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/index.html libgtkdatabox-0.9.2.0/docs/reference/html/index.html --- libgtkdatabox-0.9.1.1/docs/reference/html/index.html 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/index.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ - - - - -GtkDatabox Reference Manual - - - - - - - - -
-
-
-
-
-
-
GtkDatabox
-
-
-GtkDatabox — A GTK+ widget to display large amounts of numerical data quickly and easily. -
-
-GtkDataboxGraph — An abstract anchestor for all "real" graphs. -
-
-GtkDataboxXYCGraph — An abstract anchestor for all graphs which display xy-values in one color. -
-
-GtkDataboxPoints — A GtkDataboxGraph used for displaying xy-values as dots. -
-
-GtkDataboxLines — A GtkDataboxGraph used for displaying xy-values series of connected lines. -
-
-GtkDataboxBars — A GtkDataboxGraph used for displaying xy-values as vertical bars. -
-
-GtkDataboxGrid — A GtkDataboxGraph used for displaying a grid (like in an oscilloscope). -
-
-GtkDataboxCrossSimple — A GtkDataboxGraph used for displaying a simple coordinate cross. -
-
-GtkDataboxRuler — An improved version of the GtkRuler. -
-
-GtkDataboxMarkers — A GtkDataboxGraph used for displaying labeled markers for xy-values. -
-
-gtkdatabox_marshal -
-
-gtkdatabox_scale -
-
-gtkdatabox_typedefs -
-
-
-
-
-
- Generated by GTK-Doc V1.10
- - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/index.sgml libgtkdatabox-0.9.2.0/docs/reference/html/index.sgml --- libgtkdatabox-0.9.1.1/docs/reference/html/index.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/index.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/docs/reference/html/left.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/docs/reference/html/left.png differ Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/docs/reference/html/right.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/docs/reference/html/right.png differ diff -Nru libgtkdatabox-0.9.1.1/docs/reference/html/style.css libgtkdatabox-0.9.2.0/docs/reference/html/style.css --- libgtkdatabox-0.9.1.1/docs/reference/html/style.css 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/html/style.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ -.synopsis, .classsynopsis -{ - background: #eeeeee; - border: solid 1px #aaaaaa; - padding: 0.5em; -} -.programlisting -{ - background: #eeeeff; - border: solid 1px #aaaaff; - padding: 0.5em; -} -.variablelist -{ - padding: 4px; - margin-left: 3em; -} -.variablelist td:first-child -{ - vertical-align: top; -} - -/* this is needed so that the local anchors are displayed below the naviagtion */ -@media screen { - sup a.footnote - { - position: relative; - top: 0em ! important; - } - div.refnamediv a[name], div.refsect1 a[name] - { - position: relative; - top: -4.5em; - } - table.navigation#top - { - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; - } - .navigation a - { - color: #770000; - } - .navigation a:visited - { - color: #550000; - } - td.shortcuts - { - color: #770000; - font-size: 80%; - } - div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface - { - position: relative; - top: 3em; - z-index: 0; - } - div.refnamediv - { - margin-top: 2em; - } - body - { - padding-bottom: 20em; - } -} -@media print { - table.navigation { - visibility: collapse; - display: none; - } - div.titlepage table.navigation { - visibility: visible; - display: table; - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 2em; - } -} - -.navigation .title -{ - font-size: 200%; -} - - -div.gallery-float -{ - float: left; - padding: 10px; -} -div.gallery-float img -{ - border-style: none; -} -div.gallery-spacer -{ - clear: both; -} -a -{ - text-decoration: none; -} -a:hover -{ - text-decoration: underline; - color: #FF0000; -} - -div.table table -{ - border-collapse: collapse; - border-spacing: 0px; - border-style: solid; - border-color: #777777; - border-width: 1px; -} - -div.table table td, div.table table th -{ - border-style: solid; - border-color: #777777; - border-width: 1px; - padding: 3px; - vertical-align: top; -} - -div.table table th -{ - background-color: #eeeeee; -} - -hr -{ - color: #777777; - background: #777777; - border: 0; - height: 1px; - clear: both; -} - -.footer -{ - padding-top: 3.5em; - color: #777777; - text-align: center; - font-size: 80%; -} Binary files /tmp/kL2MibWznk/libgtkdatabox-0.9.1.1/docs/reference/html/up.png and /tmp/PYFzWYWpqA/libgtkdatabox-0.9.2.0/docs/reference/html/up.png differ diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,472 +0,0 @@ - -GtkDatabox - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@: - -@databox: the object which received the signal. - - - - - - -@: -@: - -@databox: the object which received the signal. -@arg1: - - - - - - -@: -@: - -@databox: the object which received the signal. -@arg1: - - - - - - -@: -@: - -@databox: the object which received the signal. -@arg1: - - - - - - -@: - -@databox: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@Returns: - - - - - - - -@box: -@graph: -@Returns: - - - - - - - -@box: -@graph: -@Returns: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@border: -@Returns: - - - - - - - -@box: -@min_x: -@max_x: -@min_y: -@max_y: -@Returns: - - - - - - - -@box: -@left: -@right: -@top: -@bottom: - - - - - - - -@box: -@left: -@right: -@top: -@bottom: - - - - - - - -@box: -@left: -@right: -@top: -@bottom: - - - - - - - -@box: -@left: -@right: -@top: -@bottom: - - - - - - - -@box: -@adj: - - - - - - - -@box: -@adj: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@ruler: - - - - - - - -@box: -@ruler: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@scale_type: - - - - - - - -@box: -@scale_type: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@enable: - - - - - - - -@box: -@enable: - - - - - - - -@box: -@Returns: - - - - - - - -@box: -@Returns: - - - - - - - -@box: - - - - - - - -@box: - - - - - - - -@box: - - - - - - - -@box: -@value: -@Returns: - - - - - - - -@box: -@value: -@Returns: - - - - - - - -@box: -@pixel: -@Returns: - - - - - - - -@box: -@pixel: -@Returns: - - - - - - - -@box: -@len: -@values_x: -@values_y: -@pixels: - - - - - - - -@p_box: -@p_table: -@scrollbar_x: -@scrollbar_y: -@ruler_x: -@ruler_y: - - - - - - - -@box: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_bars.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_bars.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_bars.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_bars.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ - -GtkDataboxBars - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@len: -@X: -@Y: -@color: -@size: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_cross_simple.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_cross_simple.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_cross_simple.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_cross_simple.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ - -GtkDataboxCrossSimple - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@color: -@size: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_graph.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_graph.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_graph.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_graph.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ - -GtkDataboxGraph - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@graph: -@Returns: - - - - - - - -@graph: -@gc: - - - - - - - -@graph: -@hide: - - - - - - - -@graph: -@Returns: - - - - - - - -@graph: -@color: - - - - - - - -@graph: -@Returns: - - - - - - - -@graph: -@size: - - - - - - - -@graph: -@Returns: - - - - - - - -@graph: -@min_x: -@max_x: -@min_y: -@max_y: -@Returns: - - - - - - - -@graph: -@box: - - - - - - - -@graph: -@box: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_grid.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_grid.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_grid.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_grid.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ - -GtkDataboxGrid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@hlines: -@vlines: -@color: -@size: -@Returns: - - - - - - - -@hlines: -@vlines: -@hline_vals: -@vline_vals: -@color: -@size: -@Returns: - - - - - - - -@grid: -@hlines: - - - - - - - -@grid: -@Returns: - - - - - - - -@grid: -@vlines: - - - - - - - -@grid: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_lines.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_lines.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_lines.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_lines.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ - -GtkDataboxLines - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@len: -@X: -@Y: -@color: -@size: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_markers.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_markers.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_markers.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_markers.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ - -GtkDataboxMarkers - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@GTK_DATABOX_MARKERS_C: -@GTK_DATABOX_MARKERS_N: -@GTK_DATABOX_MARKERS_E: -@GTK_DATABOX_MARKERS_S: -@GTK_DATABOX_MARKERS_W: - - - - - - -@GTK_DATABOX_MARKERS_TEXT_CENTER: -@GTK_DATABOX_MARKERS_TEXT_N: -@GTK_DATABOX_MARKERS_TEXT_NE: -@GTK_DATABOX_MARKERS_TEXT_E: -@GTK_DATABOX_MARKERS_TEXT_SE: -@GTK_DATABOX_MARKERS_TEXT_S: -@GTK_DATABOX_MARKERS_TEXT_SW: -@GTK_DATABOX_MARKERS_TEXT_W: -@GTK_DATABOX_MARKERS_TEXT_NW: - - - - - - -@GTK_DATABOX_MARKERS_NONE: -@GTK_DATABOX_MARKERS_TRIANGLE: -@GTK_DATABOX_MARKERS_SOLID_LINE: -@GTK_DATABOX_MARKERS_DASHED_LINE: - - - - - - - - - - - - - - - - - -@len: -@X: -@Y: -@color: -@size: -@type: -@Returns: - - - - - - - -@markers: -@index: -@position: - - - - - - - -@markers: -@index: -@label_position: -@text: -@boxed: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_marshal.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_marshal.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_marshal.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_marshal.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ - -gtkdatabox_marshal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_points.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_points.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_points.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_points.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ - -GtkDataboxPoints - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@len: -@X: -@Y: -@color: -@size: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_ruler.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_ruler.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_ruler.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_ruler.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ - -GtkDataboxRuler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@orientation: -@Returns: - - - - - - - -@ruler: -@lower: -@upper: -@position: - - - - - - - -@ruler: -@max_length: - - - - - - - -@ruler: -@scale_type: - - - - - - - -@ruler: -@lower: -@upper: -@position: - - - - - - - -@ruler: -@Returns: - - - - - - - -@ruler: -@Returns: - - - - - - - -@ruler: -@orientation: - - - - - - - -@ruler: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_scale.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_scale.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_scale.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_scale.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ - -gtkdatabox_scale - - - - - - - - - - - - - - - - - - - - - - -@GTK_DATABOX_SCALE_LINEAR: -@GTK_DATABOX_SCALE_LOG2: -@GTK_DATABOX_SCALE_LOG: - - - - - - -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_typedefs.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_typedefs.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_typedefs.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_typedefs.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ - -gtkdatabox_typedefs - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@databox: the object which received the signal. - - - - - - -@databox: the object which received the signal. -@arg1: - - - - - - -@databox: the object which received the signal. -@arg1: - - - - - - -@databox: the object which received the signal. -@arg1: - - - - - - -@databox: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_xyc_graph.sgml libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_xyc_graph.sgml --- libgtkdatabox-0.9.1.1/docs/reference/tmpl/gtkdatabox_xyc_graph.sgml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/tmpl/gtkdatabox_xyc_graph.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ - -GtkDataboxXYCGraph - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@xyc_graph: -@Returns: - - - - - - - -@xyc_graph: -@Returns: - - - - - - - -@xyc_graph: -@Returns: - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,1091 +0,0 @@ - - - - -GtkDatabox -3 -GTKDATABOX Library - - - -GtkDatabox -A GTK+ widget to display large amounts of numerical data quickly and easily. - - - - -Synopsis - - - -#include <gtkdatabox.h> - - GtkDataboxPrivate; - GtkDatabox; -GtkWidget* gtk_databox_new (void); -gint gtk_databox_graph_add (GtkDatabox *box, - GtkDataboxGraph *graph); -gint gtk_databox_graph_remove (GtkDatabox *box, - GtkDataboxGraph *graph); -gint gtk_databox_graph_remove_all (GtkDatabox *box); -gint gtk_databox_auto_rescale (GtkDatabox *box, - gfloat border); -gint gtk_databox_calculate_extrema (GtkDatabox *box, - gfloat *min_x, - gfloat *max_x, - gfloat *min_y, - gfloat *max_y); -void gtk_databox_set_total_limits (GtkDatabox *box, - gfloat left, - gfloat right, - gfloat top, - gfloat bottom); -void gtk_databox_set_visible_limits (GtkDatabox *box, - gfloat left, - gfloat right, - gfloat top, - gfloat bottom); -void gtk_databox_get_total_limits (GtkDatabox *box, - gfloat *left, - gfloat *right, - gfloat *top, - gfloat *bottom); -void gtk_databox_get_visible_limits (GtkDatabox *box, - gfloat *left, - gfloat *right, - gfloat *top, - gfloat *bottom); -void gtk_databox_set_adjustment_x (GtkDatabox *box, - GtkAdjustment *adj); -void gtk_databox_set_adjustment_y (GtkDatabox *box, - GtkAdjustment *adj); -GtkAdjustment* gtk_databox_get_adjustment_x (GtkDatabox *box); -GtkAdjustment* gtk_databox_get_adjustment_y (GtkDatabox *box); -void gtk_databox_set_ruler_x (GtkDatabox *box, - GtkDataboxRuler *ruler); -void gtk_databox_set_ruler_y (GtkDatabox *box, - GtkDataboxRuler *ruler); -GtkDataboxRuler* gtk_databox_get_ruler_x (GtkDatabox *box); -GtkDataboxRuler* gtk_databox_get_ruler_y (GtkDatabox *box); -void gtk_databox_set_scale_type_x (GtkDatabox *box, - GtkDataboxScaleType scale_type); -void gtk_databox_set_scale_type_y (GtkDatabox *box, - GtkDataboxScaleType scale_type); -GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox *box); -GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox *box); -void gtk_databox_set_enable_selection (GtkDatabox *box, - gboolean enable); -void gtk_databox_set_enable_zoom (GtkDatabox *box, - gboolean enable); -gboolean gtk_databox_get_enable_selection (GtkDatabox *box); -gboolean gtk_databox_get_enable_zoom (GtkDatabox *box); -void gtk_databox_zoom_to_selection (GtkDatabox *box); -void gtk_databox_zoom_out (GtkDatabox *box); -void gtk_databox_zoom_home (GtkDatabox *box); -gint16 gtk_databox_value_to_pixel_x (GtkDatabox *box, - gfloat value); -gint16 gtk_databox_value_to_pixel_y (GtkDatabox *box, - gfloat value); -gfloat gtk_databox_pixel_to_value_x (GtkDatabox *box, - gint16 pixel); -gfloat gtk_databox_pixel_to_value_y (GtkDatabox *box, - gint16 pixel); -void gtk_databox_values_to_pixels (GtkDatabox *box, - guint len, - const gfloat *values_x, - const gfloat *values_y, - GdkPoint *pixels); -void gtk_databox_create_box_with_scrollbars_and_rulers - (GtkWidget **p_box, - GtkWidget **p_table, - gboolean scrollbar_x, - gboolean scrollbar_y, - gboolean ruler_x, - gboolean ruler_y); -GdkPixmap* gtk_databox_get_backing_pixmap (GtkDatabox *box); - - - - -Object Hierarchy - - GObject - +----GInitiallyUnowned - +----GtkObject - +----GtkWidget - +----GtkDatabox - - - - - - - -Implemented Interfaces - -GtkDatabox implements - AtkImplementorIface and GtkBuildable. - - - - - -Properties - - "adjustment-x" GtkAdjustment* : Read / Write / Construct - "adjustment-y" GtkAdjustment* : Read / Write / Construct - "enable-selection" gboolean : Read / Write / Construct - "enable-zoom" gboolean : Read / Write / Construct - "ruler-x" GtkDataboxRuler* : Read / Write / Construct - "ruler-y" GtkDataboxRuler* : Read / Write / Construct - "scale-type-x" GtkDataboxScaleType : Read / Write / Construct - "scale-type-y" GtkDataboxScaleType : Read / Write / Construct - - - - -Signals - - "selection-canceled" : Run First - "selection-changed" : Run First - "selection-finalized" : Run First - "selection-started" : Run First - "zoomed" : Run First - - - - - -Description - -GtkDatabox is a widget for the GTK+ library designed to display -large amounts of numerical data quickly and easily. It allows -for one or more data sets of thousands of data points (X and Y coordinates) -to be displayed and updated in split seconds. - - -It offers the ability to zoom into and out of the data, and to navigate -through your data by scrolling. - - -In addition to rulers and a simple -coordinate cross, it allows you to add one (or even more) configurable grids -like on an oscilloscope. - - -Data may be presented as dots, lines connecting the data, -or vertical bars. The widget allows you to easily transform pixel -coordinates into data coordinates, thus allowing you to easily create -powerful applications for data analysis. - - - - - - -Details - -GtkDataboxPrivate -GtkDataboxPrivatetypedef struct _GtkDataboxPrivate GtkDataboxPrivate; - -A private data structure used by the GtkDatabox. It shields all internal things -from developers who are just using the widget. - - - - -GtkDatabox -GtkDataboxtypedef struct _GtkDatabox GtkDatabox; - -A GTK+ widget to display large amounts of numerical data quickly and easily. -The numerical data is represented/displayed by GtkDataboxGraph objects, e.g. -GtkDataboxPoints. - - -Implemented by _GtkDatabox; - - - - - -gtk_databox_new () -gtk_databox_newGtkWidget* gtk_databox_new (void); - -Creates a new GtkDatabox widget. - - - -Returns : The new GtkDatabox widget. - - - - -gtk_databox_graph_add () -gtk_databox_graph_addgint gtk_databox_graph_add (GtkDatabox *box, - GtkDataboxGraph *graph); - -Adds the graph to the box. The next time the box is re-drawn, the graph will be shown. - - -It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()). - - - -box : - A GtkDatabox widget - -graph : - A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object - -Returns : 0 on success, -1 otherwise - - - -gtk_databox_graph_remove () -gtk_databox_graph_removegint gtk_databox_graph_remove (GtkDatabox *box, - GtkDataboxGraph *graph); - -Removes the graph from the box once. The next time the box is re-drawn, the graph will not be shown (unless it was added more -than once). - - - -box : - A GtkDatabox widget - -graph : - A graph, e.g. a GtkDataboxPoints or a GtkDataboxGrid object - -Returns : 0 on success, -1 otherwise - - - -gtk_databox_graph_remove_all () -gtk_databox_graph_remove_allgint gtk_databox_graph_remove_all (GtkDatabox *box); - -Removes all graphs from the box. The next time the box is re-drawn, no graphs will be shown. - - - -box : - A GtkDatabox widget - -Returns : 0 on success, -1 otherwise - - - -gtk_databox_auto_rescale () -gtk_databox_auto_rescalegint gtk_databox_auto_rescale (GtkDatabox *box, - gfloat border); - -This function is similar to gtk_databox_set_total_limits(). It sets the total limits -to match the data extrema (see gtk_databox_calculate_extrema()). If you do not like data pixels exactly at the -widget's border, you can add modify the limits using the border parameter: The limits are extended by -border*(max-min) if max!=min. If max==min, they are extended by border*max (otherwise the data could not be -scaled to the pixel realm). - - -After calling this function, x values grow from left to right, y values grow from bottom to top. - - - -box : - A GtkDatabox widget - -border : - Relative border width (e.g. 0.1 means that the border on each side is 10% of the data area). - -Returns : 0 on success, - -1 if box is no GtkDatabox widget, - -2 if no datasets are available - - - -gtk_databox_calculate_extrema () -gtk_databox_calculate_extremagint gtk_databox_calculate_extrema (GtkDatabox *box, - gfloat *min_x, - gfloat *max_x, - gfloat *min_y, - gfloat *max_y); - -Determines the minimum and maximum x and y values of all -GtkDataboxGraph objects which have been added to the GtkDatabox widget via gtk_databox_graph_add(). - - - -box : - A GtkDatabox widget - -min_x : - Will be filled with the lowest x value of all datasets - -max_x : - Will be filled with the highest x value of all datasets - -min_y : - Will be filled with the lowest y value of all datasets - -max_y : - Will be filled with the highest y value of all datasets - -Returns : 0 on success, - -1 if box is no GtkDatabox widget, - -2 if no datasets are available - - - -gtk_databox_set_total_limits () -gtk_databox_set_total_limitsvoid gtk_databox_set_total_limits (GtkDatabox *box, - gfloat left, - gfloat right, - gfloat top, - gfloat bottom); - -This function is used to set the limits of the total -display area of box. -This function can be used to invert the orientation of the displayed graphs, -e.g. top=-1000 and bottom=0. - - -Side effect: The box also internally calls gtk_databox_set_visible_limits() with the same values. - - - -box : - A GtkDatabox widget - -left : - Left total limit - -right : - Right total limit - -top : - Top total limit - -bottom : - Bottom total limit - - - -gtk_databox_set_visible_limits () -gtk_databox_set_visible_limitsvoid gtk_databox_set_visible_limits (GtkDatabox *box, - gfloat left, - gfloat right, - gfloat top, - gfloat bottom); - -This function is used to set the limits of the visible -display area of box. The visible display area can be section of the total -area, i.e. the box zooms in, showing only a part of the complete picture. - - -The orientation of the values have to be the same as in gtk_databox_set_total_limits() and -the visible limits have to be within the total limits. The -values will not be used otherwise. - - -Side effect: The box emits "zoomed". - - - -box : - A GtkDatabox widget - -left : - Left visible limit - -right : - Right visible limit - -top : - Top visible limit - -bottom : - Bottom visible limit - - - -gtk_databox_get_total_limits () -gtk_databox_get_total_limitsvoid gtk_databox_get_total_limits (GtkDatabox *box, - gfloat *left, - gfloat *right, - gfloat *top, - gfloat *bottom); - -Gives the total limits (as set by gtk_databox_auto_rescale() or gtk_databox_set_total_limits()). - - - -box : - A GtkDatabox widget - -left : - Space for total left value or NULL - -right : - Space for total right value or NULL - -top : - Space for total top value or NULL - -bottom : - Space for total bottom value or NULL - - - -gtk_databox_get_visible_limits () -gtk_databox_get_visible_limitsvoid gtk_databox_get_visible_limits (GtkDatabox *box, - gfloat *left, - gfloat *right, - gfloat *top, - gfloat *bottom); - -Gives the current visible limits. These differ from those given by gtk_databox_get_total_limits() if -you zoomed into the data for instance by gtk_databox_zoom_to_selection() or gtk_databox_set_visible_limits() (these values -can be changed by scrolling, of course). - - - -box : - A GtkDatabox widget - -left : - Space for visible left value or NULL - -right : - Space for visible right value or NULL - -top : - Space for visible top value or NULL - -bottom : - Space for visible bottom value or NULL - - - -gtk_databox_set_adjustment_x () -gtk_databox_set_adjustment_xvoid gtk_databox_set_adjustment_x (GtkDatabox *box, - GtkAdjustment *adj); - -Setter function for the "adjustment-x" property. Normally, it should not be -required to use this function, see property documentation. - - - -box : - A GtkDatabox widget - -adj : - A GtkAdjustment object - - - -gtk_databox_set_adjustment_y () -gtk_databox_set_adjustment_yvoid gtk_databox_set_adjustment_y (GtkDatabox *box, - GtkAdjustment *adj); - -Setter function for the "adjustment-y" property. Normally, it should not be -required to use this function, see property documentation. - - - -box : - A GtkDatabox widget - -adj : - A GtkAdjustment object - - - -gtk_databox_get_adjustment_x () -gtk_databox_get_adjustment_xGtkAdjustment* gtk_databox_get_adjustment_x (GtkDatabox *box); - -Getter function for the "adjustment-x" property. - - - -box : - A GtkDatabox widget. - -Returns : The "adjustment-x" property value. - - - - -gtk_databox_get_adjustment_y () -gtk_databox_get_adjustment_yGtkAdjustment* gtk_databox_get_adjustment_y (GtkDatabox *box); - -Getter function for the "adjustment-y" property. - - - -box : - A GtkDatabox widget. - -Returns : The "adjustment-y" property value. - - - - -gtk_databox_set_ruler_x () -gtk_databox_set_ruler_xvoid gtk_databox_set_ruler_x (GtkDatabox *box, - GtkDataboxRuler *ruler); - -Setter function for the "ruler-x" property. - - - -box : - A GtkDatabox widget - -ruler : - A GtkDataboxRuler object - - - -gtk_databox_set_ruler_y () -gtk_databox_set_ruler_yvoid gtk_databox_set_ruler_y (GtkDatabox *box, - GtkDataboxRuler *ruler); - -Setter function for the "ruler-y" property. - - - -box : - A GtkDatabox widget - -ruler : - An GtkDataboxRuler object - - - -gtk_databox_get_ruler_x () -gtk_databox_get_ruler_xGtkDataboxRuler* gtk_databox_get_ruler_x (GtkDatabox *box); - -Getter function for the "ruler-x" property. - - - -box : - A GtkDatabox widget. - -Returns : The "ruler-x" property value. - - - - -gtk_databox_get_ruler_y () -gtk_databox_get_ruler_yGtkDataboxRuler* gtk_databox_get_ruler_y (GtkDatabox *box); - -Getter function for the "ruler-y" property. - - - -box : - A GtkDatabox widget. - -Returns : The "ruler-y" property value. - - - - -gtk_databox_set_scale_type_x () -gtk_databox_set_scale_type_xvoid gtk_databox_set_scale_type_x (GtkDatabox *box, - GtkDataboxScaleType scale_type); - -Setter function for the "scale-type-x" property. - - - -box : - A GtkDatabox widget - -scale_type : - An GtkDataboxScaleType (linear or logarithmic) - - - -gtk_databox_set_scale_type_y () -gtk_databox_set_scale_type_yvoid gtk_databox_set_scale_type_y (GtkDatabox *box, - GtkDataboxScaleType scale_type); - -Setter function for the "scale-type-y" property. - - - -box : - A GtkDatabox widget - -scale_type : - An GtkDataboxScaleType (linear or logarithmic) - - - -gtk_databox_get_scale_type_x () -gtk_databox_get_scale_type_xGtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox *box); - -Getter function for the "scale-type-x" property. - - - -box : - A GtkDatabox widget. - -Returns : The "scale-type-x" property value. - - - - -gtk_databox_get_scale_type_y () -gtk_databox_get_scale_type_yGtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox *box); - -Getter function for the "scale-type-y" property. - - - -box : - A GtkDatabox widget. - -Returns : The "scale-type-y" property value. - - - - -gtk_databox_set_enable_selection () -gtk_databox_set_enable_selectionvoid gtk_databox_set_enable_selection (GtkDatabox *box, - gboolean enable); - -Setter function for the "enable-selection" property. - - - -box : - A GtkDatabox widget - -enable : - Whether selection via mouse is enabled or not. - - - -gtk_databox_set_enable_zoom () -gtk_databox_set_enable_zoomvoid gtk_databox_set_enable_zoom (GtkDatabox *box, - gboolean enable); - -Setter function for the "enable-zoom" property. - - - -box : - A GtkDatabox widget - -enable : - Whether zoom via mouse is enabled or not. - - - -gtk_databox_get_enable_selection () -gtk_databox_get_enable_selectiongboolean gtk_databox_get_enable_selection (GtkDatabox *box); - -Getter function for the "enable-selection" property. - - - -box : - A GtkDatabox widget. - -Returns : The "enable-selection" property value. - - - - -gtk_databox_get_enable_zoom () -gtk_databox_get_enable_zoomgboolean gtk_databox_get_enable_zoom (GtkDatabox *box); - -Getter function for the "enable-zoom" property. - - - -box : - A GtkDatabox widget. - -Returns : The "enable-zoom" property value. - - - - -gtk_databox_zoom_to_selection () -gtk_databox_zoom_to_selectionvoid gtk_databox_zoom_to_selection (GtkDatabox *box); - -This is equivalent to left-clicking into the selected area. - - -This function works, if the attribute enable-zoom is set to TRUE. Calling the function -then zooms to the area selected with the mouse. - - -Side effect: The box emits "zoomed". - - - -box : - A GtkDatabox widget - - - -gtk_databox_zoom_out () -gtk_databox_zoom_outvoid gtk_databox_zoom_out (GtkDatabox *box); - -This is equivalent to right-clicking into the box. - - -This function works, if the attribute enable-zoom is set to TRUE. Calling the function -then zooms out by a factor of 2 in both dimensions (the maximum is defined by the total -limits, see gtk_databox_set_total_limits()). - - -Side effect: The box emits "zoomed". - - - -box : - A GtkDatabox widget - - - -gtk_databox_zoom_home () -gtk_databox_zoom_homevoid gtk_databox_zoom_home (GtkDatabox *box); - -This is equivalent to shift right-clicking into the box. - - -This function works, if the attribute enable-zoom is set to TRUE. It is equivalent to -calling the gtk_databox_set_visible_limits() with the total limits. - - - -box : - A GtkDatabox widget - - - -gtk_databox_value_to_pixel_x () -gtk_databox_value_to_pixel_xgint16 gtk_databox_value_to_pixel_x (GtkDatabox *box, - gfloat value); - -Calculates the horizontal pixel coordinate which represents the x value. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0). - - - -box : - A GtkDatabox widget - -value : - An x value - -Returns : Pixel coordinate - - - -gtk_databox_value_to_pixel_y () -gtk_databox_value_to_pixel_ygint16 gtk_databox_value_to_pixel_y (GtkDatabox *box, - gfloat value); - -Calculates the vertical pixel coordinate which represents the y value. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0). - - - -box : - A GtkDatabox widget - -value : - A y value - -Returns : Pixel coordinate - - - -gtk_databox_pixel_to_value_x () -gtk_databox_pixel_to_value_xgfloat gtk_databox_pixel_to_value_x (GtkDatabox *box, - gint16 pixel); - -Calculates the x value which is represented by the horizontal pixel coordinate. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0). - - - -box : - A GtkDatabox widget - -pixel : - A horizontal pixel coordinate - -Returns : x value - - - -gtk_databox_pixel_to_value_y () -gtk_databox_pixel_to_value_ygfloat gtk_databox_pixel_to_value_y (GtkDatabox *box, - gint16 pixel); - -Calculates the y value which is represented by the vertical pixel coordinate. -Pixel coordinates are relative to the top-left corner of the box which is equivalent to (0,0). - - - -box : - A GtkDatabox widget - -pixel : - A vertical pixel coordinate - -Returns : y value - - - -gtk_databox_values_to_pixels () -gtk_databox_values_to_pixelsvoid gtk_databox_values_to_pixels (GtkDatabox *box, - guint len, - const gfloat *values_x, - const gfloat *values_y, - GdkPoint *pixels); - -Calculates the pixel equivalents of the given X/Y values and stores them in the pixels array. - - - -box : - A GtkDatabox widget - -len : - Number of values/pixels - -values_x : - Array of X values (length >= len) - -values_y : - Array of Y values (length >= len) - -pixels : - Array of pixel coordinates (length >= len) - - - -gtk_databox_create_box_with_scrollbars_and_rulers () -gtk_databox_create_box_with_scrollbars_and_rulersvoid gtk_databox_create_box_with_scrollbars_and_rulers - (GtkWidget **p_box, - GtkWidget **p_table, - gboolean scrollbar_x, - gboolean scrollbar_y, - gboolean ruler_x, - gboolean ruler_y); - -This is a convenience function which creates a GtkDatabox widget in a -GtkTable widget optionally accompanied by scrollbars and rulers. You only -have to fill in the data (gtk_databox_graph_add()) and adjust the limits -(gtk_databox_set_total_limits() or gtk_databox_auto_rescale()). - - -see_also: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y() - - - -p_box : - Will contain a pointer to a GtkDatabox widget - -p_table : - Will contain a pointer to a GtkTable widget - -scrollbar_x : - Whether to attach a horizontal scrollbar - -scrollbar_y : - Whether to attach a vertical scrollbar - -ruler_x : - Whether to attach a horizontal ruler - -ruler_y : - Whether to attach a vertical ruler - - - -gtk_databox_get_backing_pixmap () -gtk_databox_get_backing_pixmapGdkPixmap* gtk_databox_get_backing_pixmap (GtkDatabox *box); - -This function returns the pixmap which is used by box and its GtkDataboxGraph objects -for drawing operations before copying the result to the screen. - - -The function is typically called by the GtkDataboxGraph objects. - - - -box : - A GtkDatabox widget - -Returns : Backing pixmap - - - - - -Property Details -The <literal>"adjustment-x"</literal> property -GtkDatabox:adjustment-x "adjustment-x" GtkAdjustment* : Read / Write / Construct -GtkAdjustment for horizontal scrolling. -The <literal>"adjustment-y"</literal> property -GtkDatabox:adjustment-y "adjustment-y" GtkAdjustment* : Read / Write / Construct -GtkAdjustment for vertical scrolling. -The <literal>"enable-selection"</literal> property -GtkDatabox:enable-selection "enable-selection" gboolean : Read / Write / Construct - -Defines whether the user can select -rectangular areas with the mouse (TRUE) or not (FALSE). - - -Default value: TRUE - -The <literal>"enable-zoom"</literal> property -GtkDatabox:enable-zoom "enable-zoom" gboolean : Read / Write / Construct - -Defines whether the user can use the mouse to zoom in or out (TRUE) or not (FALSE). - - -Default value: TRUE - -The <literal>"ruler-x"</literal> property -GtkDatabox:ruler-x "ruler-x" GtkDataboxRuler* : Read / Write / Construct -A horizontal GtkDataboxRuler or NULL. -The <literal>"ruler-y"</literal> property -GtkDatabox:ruler-y "ruler-y" GtkDataboxRuler* : Read / Write / Construct -A vertical GtkDataboxRuler or NULL. -The <literal>"scale-type-x"</literal> property -GtkDatabox:scale-type-x "scale-type-x" GtkDataboxScaleType : Read / Write / Construct -Horizontal scale type (linear or logarithmic).Default value: GTK_DATABOX_SCALE_LINEAR - -The <literal>"scale-type-y"</literal> property -GtkDatabox:scale-type-y "scale-type-y" GtkDataboxScaleType : Read / Write / Construct -Vertical scale type (linear or logarithmic).Default value: GTK_DATABOX_SCALE_LINEAR - - - - - -Signal Details -The <literal>"selection-canceled"</literal> signal -GtkDatabox::selection-canceledvoid user_function (GtkDatabox *box, - gpointer user_data) : Run First - -This signal is emitted after a right click outside -a selection rectangle. - - - - -@: -box : - The GtkDatabox widget which zoomed in or out. - -user_data : -user data set when the signal handler was connected. -The <literal>"selection-changed"</literal> signal -GtkDatabox::selection-changedvoid user_function (GtkDatabox *box, - gpointer selection_values, - gpointer user_data) : Run First - -This signal is emitted when the mouse is moved -with the left button pressed (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values. - - - - -@: -@: -box : - The GtkDatabox widget in which the selection was changed. - -selection_values : - The corners of the selection rectangle. - -user_data : -user data set when the signal handler was connected. -The <literal>"selection-finalized"</literal> signal -GtkDatabox::selection-finalizedvoid user_function (GtkDatabox *box, - gpointer selection_values, - gpointer user_data) : Run First - -This signal is emitted when the left mouse button -is released after a selection was started before. - - -see_also: "selection-changed" - - - - -@: -@: -box : - The GtkDatabox widget in which the selection has been stopped. - -selection_values : - The corners of the selection rectangle. - -user_data : -user data set when the signal handler was connected. -The <literal>"selection-started"</literal> signal -GtkDatabox::selection-startedvoid user_function (GtkDatabox *box, - gpointer selection_values, - gpointer user_data) : Run First - -This signal is emitted when the mouse is firstmoved -with the left button pressed after the mouse-down (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values. - - -see_also: "selection-changed" - - - - -@: -@: -box : - The GtkDatabox widget in which the selection has been started. - -selection_values : - The corners of the selection rectangle. - -user_data : -user data set when the signal handler was connected. -The <literal>"zoomed"</literal> signal -GtkDatabox::zoomedvoid user_function (GtkDatabox *box, - gpointer user_data) : Run First - -This signal is emitted each time the zoom of the widget is changed, see for example -gtk_databox_zoom_to_selection(), gtk_databox_set_visible_limits(). - - - - -@: -box : - The GtkDatabox widget which zoomed in or out. - -user_data : -user data set when the signal handler was connected. - - - - - -See Also -GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers, GtkDataboxGrid - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_bars.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_bars.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_bars.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_bars.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ - - - - -GtkDataboxBars -3 -GTKDATABOX Library - - - -GtkDataboxBars -A GtkDataboxGraph used for displaying xy-values as vertical bars. - - - - -Synopsis - - - -#include <gtkdatabox_bars.h> - - GtkDataboxBarsPrivate; - GtkDataboxBars; -GtkDataboxGraph* gtk_databox_bars_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - guint size); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxBars - - - - - - - - - - - - -Description - -GtkDataboxBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y=0. - - - - - - -Details - -GtkDataboxBarsPrivate -GtkDataboxBarsPrivatetypedef struct _GtkDataboxBarsPrivate GtkDataboxBarsPrivate; - -A private data structure used by the GtkDataboxBars. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxBars -GtkDataboxBarstypedef struct _GtkDataboxBars GtkDataboxBars; - -GtkDataboxBars is a GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y=0. - - - - - -gtk_databox_bars_new () -gtk_databox_bars_newGtkDataboxGraph* gtk_databox_bars_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - guint size); - -Creates a new GtkDataboxBars object which can be added to a GtkDatabox widget - - - -len : - length of X and Y - -X : - array of horizontal position values of markers - -Y : - array of vertical position values of markers - -color : - color of the markers - -size : - marker size or line width (depending on the type) - -Returns : A new GtkDataboxBars object - - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxMarkers - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_cross_simple.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_cross_simple.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_cross_simple.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_cross_simple.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ - - - - -GtkDataboxCrossSimple -3 -GTKDATABOX Library - - - -GtkDataboxCrossSimple -A GtkDataboxGraph used for displaying a simple coordinate cross. - - - - -Synopsis - - - -#include <gtkdatabox_cross_simple.h> - - GtkDataboxCrossSimplePrivate; - GtkDataboxCrossSimple; -GtkDataboxGraph* gtk_databox_cross_simple_new (GdkColor *color, - guint size); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxMarkers - +----GtkDataboxCrossSimple - - - - - - - - - - - - -Description - -GtkDataboxCrossSimple is a GtkDataboxGraph class for displaying a simple coordinate cross (a vertical line -at x=0 and a horizontal line at y=0). - - -A more sophisticated coordinate cross would be welcome :-) - - - - - - -Details - -GtkDataboxCrossSimplePrivate -GtkDataboxCrossSimplePrivatetypedef struct _GtkDataboxCrossSimplePrivate GtkDataboxCrossSimplePrivate; - -A private data structure used by the GtkDataboxCrossSimple. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxCrossSimple -GtkDataboxCrossSimpletypedef struct _GtkDataboxCrossSimple GtkDataboxCrossSimple; - -GtkDataboxCrossSimple is a GtkDataboxGraph class for displaying a simple coordinate cross (a vertical line -at x=0 and a horizontal line at y=0). - - -A more sophisticated coordinate cross would be welcome :-) - - - - - -gtk_databox_cross_simple_new () -gtk_databox_cross_simple_newGtkDataboxGraph* gtk_databox_cross_simple_new (GdkColor *color, - guint size); - -Creates a new GtkDataboxCrossSimple object which can be added to a GtkDatabox widget as nice decoration for other graphs. - - - -color : - color of the markers - -size : - marker size or line width (depending on the type) - -Returns : A new GtkDataboxCrossSimple object - - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_graph.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_graph.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_graph.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_graph.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,336 +0,0 @@ - - - - -GtkDataboxGraph -3 -GTKDATABOX Library - - - -GtkDataboxGraph -An abstract anchestor for all "real" graphs. - - - - -Synopsis - - - -#include <gtkdatabox_graph.h> - - GtkDataboxGraphPrivate; - GtkDataboxGraph; -GdkGC* gtk_databox_graph_get_gc (GtkDataboxGraph *graph); -void gtk_databox_graph_set_gc (GtkDataboxGraph *graph, - GdkGC *gc); -void gtk_databox_graph_set_hide (GtkDataboxGraph *graph, - gboolean hide); -gboolean gtk_databox_graph_get_hide (GtkDataboxGraph *graph); -void gtk_databox_graph_set_color (GtkDataboxGraph *graph, - GdkColor *color); -GdkColor* gtk_databox_graph_get_color (GtkDataboxGraph *graph); -void gtk_databox_graph_set_size (GtkDataboxGraph *graph, - gint size); -gint gtk_databox_graph_get_size (GtkDataboxGraph *graph); -gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph *graph, - gfloat *min_x, - gfloat *max_x, - gfloat *min_y, - gfloat *max_y); -void gtk_databox_graph_draw (GtkDataboxGraph *graph, - GtkDatabox *box); -GdkGC* gtk_databox_graph_create_gc (GtkDataboxGraph *graph, - GtkDatabox *box); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxGrid - - - - - - - - - -Properties - - "color" gpointer : Read / Write - "hide" gboolean : Read / Write - "size" gint : Read / Write - - - - - - -Description - -GtkDataboxGraphs can display data or other things in a GtkDatabox widget. - - -This class is just the basic interface. Other graph classes are derived from this -class and implement some real things. - - - - - - -Details - -GtkDataboxGraphPrivate -GtkDataboxGraphPrivatetypedef struct _GtkDataboxGraphPrivate GtkDataboxGraphPrivate; - -A private data structure used by the GtkDataboxGraph. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxGraph -GtkDataboxGraphtypedef struct _GtkDataboxGraph GtkDataboxGraph; - -The GtkDataboxGraph is the base class for all kinds of graphs (e.g. lines, points, decorations like coordinate crosses) -to be shown in a GtkDatabox wiget. - - -Implemented by _GtkDataboxGraph - - - - - -gtk_databox_graph_get_gc () -gtk_databox_graph_get_gcGdkGC* gtk_databox_graph_get_gc (GtkDataboxGraph *graph); - -Gets the current graphics context of the graph. - - - -graph : - A GtkDataboxGraph object - -Returns : The current graphics context of the graph. - - - - -gtk_databox_graph_set_gc () -gtk_databox_graph_set_gcvoid gtk_databox_graph_set_gc (GtkDataboxGraph *graph, - GdkGC *gc); - -Sets the graphics context which the GtkDataboxGraph object is supposed to be using when drawing itself. - - - -graph : - A GtkDataboxGraph object - -gc : - Graphics contex for the graph object - - - -gtk_databox_graph_set_hide () -gtk_databox_graph_set_hidevoid gtk_databox_graph_set_hide (GtkDataboxGraph *graph, - gboolean hide); - -Hidden graphs are not shown, when the GtkDatabox containing them is redrawn. - - - -graph : - A GtkDataboxGraph object - -hide : - Declares whether should be hidden (true) or not (false). - - - -gtk_databox_graph_get_hide () -gtk_databox_graph_get_hidegboolean gtk_databox_graph_get_hide (GtkDataboxGraph *graph); - -Gets the current "hide" status. - - - -graph : - A GtkDataboxGraph object - -Returns : Whether the graph is hidden (true) or not (false). - - - - -gtk_databox_graph_set_color () -gtk_databox_graph_set_colorvoid gtk_databox_graph_set_color (GtkDataboxGraph *graph, - GdkColor *color); - -Sets the color which the GtkDataboxGraph object is supposed to be using when drawing itself. - - - -graph : - A GtkDataboxGraph object - -color : - Color which is to be used by the graph object - - - -gtk_databox_graph_get_color () -gtk_databox_graph_get_colorGdkColor* gtk_databox_graph_get_color (GtkDataboxGraph *graph); - -Gets the current color of the graph elements (e.g. points). - - - -graph : - A GtkDataboxGraph object - -Returns : The color of the graph. - - - - -gtk_databox_graph_set_size () -gtk_databox_graph_set_sizevoid gtk_databox_graph_set_size (GtkDataboxGraph *graph, - gint size); - -Sets the size (e.g. line width) which the GtkDataboxGraph object is supposed to be using when drawing itself. - - - -graph : - A GtkDataboxGraph object - -size : - Size of graph elements for the graph object - - - -gtk_databox_graph_get_size () -gtk_databox_graph_get_sizegint gtk_databox_graph_get_size (GtkDataboxGraph *graph); - -Gets the size of the graph elements (e.g. the line width). - - - -graph : - A GtkDataboxGraph object - -Returns : size of the graph elements - - - - -gtk_databox_graph_calculate_extrema () -gtk_databox_graph_calculate_extremagint gtk_databox_graph_calculate_extrema (GtkDataboxGraph *graph, - gfloat *min_x, - gfloat *max_x, - gfloat *min_y, - gfloat *max_y); - -Virtual function which determines the minimum and maximum x and y values of the values of this -GtkDataboxGraph object if applicable (there are graphs which do -not contain data). - - - -graph : - A GtkDataboxGraph object - -min_x : - Will be filled with the lowest x value of the dataset - -max_x : - Will be filled with the highest x value of the dataset - -min_y : - Will be filled with the lowest y value of the dataset - -max_y : - Will be filled with the highest y value of the dataset - -Returns : 0 on success, - -1 if no data is available, - - - - -gtk_databox_graph_draw () -gtk_databox_graph_drawvoid gtk_databox_graph_draw (GtkDataboxGraph *graph, - GtkDatabox *box); - -Virtual function which draws the GtkDataboxGraph on the drawing area of the GtkDatabox object. - - -Typically this function is called by GtkDatabox objects. - - - -graph : - A GtkDataboxGraph object - -box : - A GtkDatabox object - - - -gtk_databox_graph_create_gc () -gtk_databox_graph_create_gcGdkGC* gtk_databox_graph_create_gc (GtkDataboxGraph *graph, - GtkDatabox *box); - -Virtual function which creates a graphics context for the graph. - - -Typically called by derived graph objects when the graphics context is needed for the first time. - - - -graph : - A GtkDataboxGraph object - -box : - A GtkDatabox object - -Returns : The new graphics context. - - - - - -Property Details -The <literal>"color"</literal> property -GtkDataboxGraph:color "color" gpointer : Read / Write -Color of graph. -The <literal>"hide"</literal> property -GtkDataboxGraph:hide "hide" gboolean : Read / Write -Determine if graph is hidden or not.Default value: FALSE - -The <literal>"size"</literal> property -GtkDataboxGraph:size "size" gint : Read / Write -Size of displayed items.Default value: 0 - - - - - - - -See Also -GtkDatabox, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxGrid, GtkDataboxCrossSimple - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_grid.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_grid.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_grid.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_grid.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,241 +0,0 @@ - - - - -GtkDataboxGrid -3 -GTKDATABOX Library - - - -GtkDataboxGrid -A GtkDataboxGraph used for displaying a grid (like in an oscilloscope). - - - - -Synopsis - - - -#include <gtkdatabox_grid.h> - - GtkDataboxGridPrivate; - GtkDataboxGrid; -GtkDataboxGraph* gtk_databox_grid_new (gint hlines, - gint vlines, - GdkColor *color, - guint size); -GtkDataboxGraph* gtk_databox_grid_array_new (gint hlines, - gint vlines, - gfloat *hline_vals, - gfloat *vline_vals, - GdkColor *color, - guint size); -void gtk_databox_grid_set_hlines (GtkDataboxGrid *grid, - gint hlines); -gint gtk_databox_grid_get_hlines (GtkDataboxGrid *grid); -void gtk_databox_grid_set_vlines (GtkDataboxGrid *grid, - gint vlines); -gint gtk_databox_grid_get_vlines (GtkDataboxGrid *grid); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxGrid - - - - - - - - - -Properties - - "grid-hlines" gint : Read / Write - "grid-vlines" gint : Read / Write - - - - - - -Description - -GtkDataboxGrid is a GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine -the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data. - - - - - - -Details - -GtkDataboxGridPrivate -GtkDataboxGridPrivatetypedef struct _GtkDataboxGridPrivate GtkDataboxGridPrivate; - -A private data structure used by the GtkDataboxGrid. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxGrid -GtkDataboxGridtypedef struct _GtkDataboxGrid GtkDataboxGrid; - -GtkDataboxGrid is a GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine -the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data. - - - - -gtk_databox_grid_new () -gtk_databox_grid_newGtkDataboxGraph* gtk_databox_grid_new (gint hlines, - gint vlines, - GdkColor *color, - guint size); - -Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs. - - - -hlines : - number of horizontal lines in the grid - -vlines : - number of vertical lines in the grid - -color : - color of the grid - -size : - line width of the grid - -Returns : A new GtkDataboxGrid object - - - -gtk_databox_grid_array_new () -gtk_databox_grid_array_newGtkDataboxGraph* gtk_databox_grid_array_new (gint hlines, - gint vlines, - gfloat *hline_vals, - gfloat *vline_vals, - GdkColor *color, - guint size); - -Creates a new GtkDataboxGrid object which can be added to a GtkDatabox widget as nice decoration for other graphs. - - - -hlines : - number of horizontal lines in the grid - -vlines : - number of vertical lines in the grid - -hline_vals : - a pointer to an array of gfloat horizontal grid coordinate - -vline_vals : - a pointer to an array of gfloat vertical grid coordinate - -color : - color of the grid - -size : - line width of the grid - -Returns : A new GtkDataboxGrid object - - - -gtk_databox_grid_set_hlines () -gtk_databox_grid_set_hlinesvoid gtk_databox_grid_set_hlines (GtkDataboxGrid *grid, - gint hlines); - -Sets the number of horizontal lines in the grid. - - - -grid : - a GtkDataboxGrid graph object - -hlines : - number of vertical lines in the grid - - - -gtk_databox_grid_get_hlines () -gtk_databox_grid_get_hlinesgint gtk_databox_grid_get_hlines (GtkDataboxGrid *grid); - -Gets the number of horizontal lines in the grid. - - - -grid : - a GtkDataboxGrid graph object - -Returns : Number of horizontal lines in the grid. - - - -gtk_databox_grid_set_vlines () -gtk_databox_grid_set_vlinesvoid gtk_databox_grid_set_vlines (GtkDataboxGrid *grid, - gint vlines); - -Sets the number of vertical lines in the grid. - - - -grid : - a GtkDataboxGrid graph object - -vlines : - number of vertical lines in the grid - - - -gtk_databox_grid_get_vlines () -gtk_databox_grid_get_vlinesgint gtk_databox_grid_get_vlines (GtkDataboxGrid *grid); - -Gets the number of vertical lines in the grid. - - - -grid : - a GtkDataboxGrid graph object - -Returns : Number of vertical lines in the grid. - - - - - -Property Details -The <literal>"grid-hlines"</literal> property -GtkDataboxGrid:grid-hlines "grid-hlines" gint : Read / Write -Number of horizontal lines.Default value: 0 - -The <literal>"grid-vlines"</literal> property -GtkDataboxGrid:grid-vlines "grid-vlines" gint : Read / Write -Number of vertical lines.Default value: 0 - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_lines.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_lines.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_lines.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_lines.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ - - - - -GtkDataboxLines -3 -GTKDATABOX Library - - - -GtkDataboxLines -A GtkDataboxGraph used for displaying xy-values series of connected lines. - - - - -Synopsis - - - -#include <gtkdatabox_lines.h> - - GtkDataboxLinesPrivate; - GtkDataboxLines; -GtkDataboxGraph* gtk_databox_lines_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - guint size); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxLines - - - - - - - - - - - - -Description - -GtkDataboxLines is a GtkDataboxGraph class for displaying xy-values as series of connected lines. - - - - - - -Details - -GtkDataboxLinesPrivate -GtkDataboxLinesPrivatetypedef struct _GtkDataboxLinesPrivate GtkDataboxLinesPrivate; - -A private data structure used by the GtkDataboxLines. It shields all internal things -from developers who are just using the object. - - - - - -GtkDataboxLines -GtkDataboxLinestypedef struct _GtkDataboxLines GtkDataboxLines; - -GtkDataboxLines is a GtkDataboxGraph class for displaying xy-values as series of connected lines. - - - - -gtk_databox_lines_new () -gtk_databox_lines_newGtkDataboxGraph* gtk_databox_lines_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - guint size); - -Creates a new GtkDataboxLines object which can be added to a GtkDatabox widget. - - - -len : - length of X and Y - -X : - array of horizontal position values of markers - -Y : - array of vertical position values of markers - -color : - color of the markers - -size : - marker size or line width (depending on the type) - -Returns : A new GtkDataboxLines object - - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxBars, GtkDataboxMarkers - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_markers.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_markers.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_markers.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_markers.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ - - - - -GtkDataboxMarkers -3 -GTKDATABOX Library - - - -GtkDataboxMarkers -A GtkDataboxGraph used for displaying labeled markers for xy-values. - - - - -Synopsis - - - -#include <gtkdatabox_markers.h> - - GtkDataboxMarkersPrivate; -enum GtkDataboxMarkersPosition; -enum GtkDataboxMarkersTextPosition; -enum GtkDataboxMarkersType; - GtkDataboxMarkers; -GtkDataboxGraph* gtk_databox_markers_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - guint size, - GtkDataboxMarkersType type); -void gtk_databox_markers_set_position (GtkDataboxMarkers *markers, - guint index, - GtkDataboxMarkersPosition position); -void gtk_databox_markers_set_label (GtkDataboxMarkers *markers, - guint index, - GtkDataboxMarkersTextPosition label_position, - gchar *text, - gboolean boxed); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxMarkers - +----GtkDataboxCrossSimple - - - - - - - - - -Properties - - "markers-type" gint : Read / Write / Construct - - - - - - -Description - -GtkDataboxMarkers is a GtkDataboxGraph class for displaying labeled markers (circles, triangles, lines) for xy-values. - - - - - - -Details - -GtkDataboxMarkersPrivate -GtkDataboxMarkersPrivatetypedef struct _GtkDataboxMarkersPrivate GtkDataboxMarkersPrivate; - -A private data structure used by the GtkDataboxMarkers. It shields all internal things -from developers who are just using the object. - - - - -enum GtkDataboxMarkersPosition -GtkDataboxMarkersPosition typedef enum - { - GTK_DATABOX_MARKERS_C = 0, - GTK_DATABOX_MARKERS_N, - GTK_DATABOX_MARKERS_E, - GTK_DATABOX_MARKERS_S, - GTK_DATABOX_MARKERS_W - } - GtkDataboxMarkersPosition; - - -Position of a marker relative to its respective X/Y value. - - - - -GTK_DATABOX_MARKERS_C - centered on data - - - -GTK_DATABOX_MARKERS_N - marker is positioned north of data - - - -GTK_DATABOX_MARKERS_E - marker is positioned east of data - - - -GTK_DATABOX_MARKERS_S - marker is positioned south of data - - - -GTK_DATABOX_MARKERS_W - marker is positioned west of data - - - - -enum GtkDataboxMarkersTextPosition -GtkDataboxMarkersTextPosition typedef enum - { - GTK_DATABOX_MARKERS_TEXT_CENTER = 0,/* text centered on marker */ - GTK_DATABOX_MARKERS_TEXT_N, /* text north of marker */ - GTK_DATABOX_MARKERS_TEXT_NE, /* text north-east of marker */ - GTK_DATABOX_MARKERS_TEXT_E, /* text east of marker */ - GTK_DATABOX_MARKERS_TEXT_SE, /* text south-east of marker */ - GTK_DATABOX_MARKERS_TEXT_S, /* text south of marker */ - GTK_DATABOX_MARKERS_TEXT_SW, /* text south-west of marker */ - GTK_DATABOX_MARKERS_TEXT_W, /* text west of marker */ - GTK_DATABOX_MARKERS_TEXT_NW /* text north-west of marker */ - } - GtkDataboxMarkersTextPosition; - - -Position of a label relative to its repective marker. - - - - -GTK_DATABOX_MARKERS_TEXT_CENTER - text centered on marker - - - -GTK_DATABOX_MARKERS_TEXT_N - text north of marker - - - -GTK_DATABOX_MARKERS_TEXT_NE - text north-east of marker - - - -GTK_DATABOX_MARKERS_TEXT_E - text east of marker - - - -GTK_DATABOX_MARKERS_TEXT_SE - text south-east of marker - - - -GTK_DATABOX_MARKERS_TEXT_S - text south of marker - - - -GTK_DATABOX_MARKERS_TEXT_SW - text south-west of marker - - - -GTK_DATABOX_MARKERS_TEXT_W - text west of marker - - - -GTK_DATABOX_MARKERS_TEXT_NW - text north-west of marker - - - - -enum GtkDataboxMarkersType -GtkDataboxMarkersType typedef enum - { - GTK_DATABOX_MARKERS_NONE = 0, /* No Marker (just text) */ - GTK_DATABOX_MARKERS_TRIANGLE, /* Marker is a triangle */ - GTK_DATABOX_MARKERS_SOLID_LINE, /* Marker is a solid line */ - GTK_DATABOX_MARKERS_DASHED_LINE /* Marker is a dashed line */ - } - GtkDataboxMarkersType; - - -Type of the marker - - - - -GTK_DATABOX_MARKERS_NONE - No Marker (just text) - - - -GTK_DATABOX_MARKERS_TRIANGLE - Marker is a triangle - - - -GTK_DATABOX_MARKERS_SOLID_LINE - Marker is a solid line - - - -GTK_DATABOX_MARKERS_DASHED_LINE - Marker is a dashed line - - - - -GtkDataboxMarkers -GtkDataboxMarkerstypedef struct _GtkDataboxMarkers GtkDataboxMarkers; - -GtkDataboxMarkers is a GtkDataboxGraph class for displaying labeled markers (circles, triangles, lines) for xy-values. - - - - - -gtk_databox_markers_new () -gtk_databox_markers_newGtkDataboxGraph* gtk_databox_markers_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - guint size, - GtkDataboxMarkersType type); - -Creates a new GtkDataboxMarkers object which can be added to a GtkDatabox widget as nice decoration for other graphs. - - - -len : - length of X and Y - -X : - array of horizontal position values of markers - -Y : - array of vertical position values of markers - -color : - color of the markers - -size : - marker size or line width (depending on the type) - -type : - type of markers (e.g. triangle or circle) - -Returns : A new GtkDataboxMarkers object - - - -gtk_databox_markers_set_position () -gtk_databox_markers_set_positionvoid gtk_databox_markers_set_position (GtkDataboxMarkers *markers, - guint index, - GtkDataboxMarkersPosition position); - -Sets a position for one of the markers. - - - -markers : - A GtkDataboxMarkers object - -index : - index within the array of X/Y values - -position : - position of the marker (e.g. circle or triangle relative to their X/Y value - - - -gtk_databox_markers_set_label () -gtk_databox_markers_set_labelvoid gtk_databox_markers_set_label (GtkDataboxMarkers *markers, - guint index, - GtkDataboxMarkersTextPosition label_position, - gchar *text, - gboolean boxed); - -Sets a label for one of the markers. - - - -markers : - A GtkDataboxMarkers object - -index : - index within the array of X/Y values - -label_position : - position of the label relative to the marker - -text : - text to be displayed in the label - -boxed : - Whether the label is to be enclosed in a box (true) or not (false) - - - - - -Property Details -The <literal>"markers-type"</literal> property -GtkDataboxMarkers:markers-type "markers-type" gint : Read / Write / Construct -Type of markers for this graph, e.g. triangles or lines.Default value: 0 - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_marshal.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_marshal.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_marshal.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_marshal.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ - - - - -gtkdatabox_marshal -3 -GTKDATABOX Library - - - -gtkdatabox_marshal - - - - - -Synopsis - - -#define gtk_databox_marshal_VOID__VOID -#define gtk_databox_marshal_VOID__POINTER - - - - - - - - - - - - -Description - - - - - - -Details - -gtk_databox_marshal_VOID__VOID -gtk_databox_marshal_VOID__VOID#define gtk_databox_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID - - - - - -gtk_databox_marshal_VOID__POINTER -gtk_databox_marshal_VOID__POINTER#define gtk_databox_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER - - - - - - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_points.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_points.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_points.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_points.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ - - - - -GtkDataboxPoints -3 -GTKDATABOX Library - - - -GtkDataboxPoints -A GtkDataboxGraph used for displaying xy-values as dots. - - - - -Synopsis - - - -#include <gtkdatabox_points.h> - - GtkDataboxPointsPrivate; - GtkDataboxPoints; -GtkDataboxGraph* gtk_databox_points_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - gint size); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxPoints - - - - - - - - - - - - -Description - -GtkDataboxPoints is a GtkDataboxGraph class for displaying xy-values as dots. - - - - - - -Details - -GtkDataboxPointsPrivate -GtkDataboxPointsPrivatetypedef struct _GtkDataboxPointsPrivate GtkDataboxPointsPrivate; - -A private data structure used by the GtkDataboxPoints. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxPoints -GtkDataboxPointstypedef struct _GtkDataboxPoints GtkDataboxPoints; - -GtkDataboxPoints is a GtkDataboxGraph class for displaying xy-values as dots. - - - - - -gtk_databox_points_new () -gtk_databox_points_newGtkDataboxGraph* gtk_databox_points_new (guint len, - gfloat *X, - gfloat *Y, - GdkColor *color, - gint size); - -Creates a new GtkDataboxPoints object which can be added to a GtkDatabox widget. - - - -len : - length of X and Y - -X : - array of horizontal position values of markers - -Y : - array of vertical position values of markers - -color : - color of the markers - -size : - marker size or line width (depending on the type) - -Returns : A new GtkDataboxPoints object - - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxLines, GtkDataboxBars, GtkDataboxMarkers - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_ruler.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_ruler.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_ruler.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_ruler.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,344 +0,0 @@ - - - - -GtkDataboxRuler -3 -GTKDATABOX Library - - - -GtkDataboxRuler -An improved version of the GtkRuler. - - - - -Synopsis - - - -#include <gtkdatabox_ruler.h> - -#define GTK_DATABOX_RULER_MAX_MAX_LENGTH - GtkDataboxRulerPrivate; - GtkDataboxRuler; -GtkWidget* gtk_databox_ruler_new (GtkOrientation orientation); -void gtk_databox_ruler_set_range (GtkDataboxRuler *ruler, - gdouble lower, - gdouble upper, - gdouble position); -void gtk_databox_ruler_set_max_length (GtkDataboxRuler *ruler, - guint max_length); -void gtk_databox_ruler_set_scale_type (GtkDataboxRuler *ruler, - guint scale_type); -void gtk_databox_ruler_get_range (GtkDataboxRuler *ruler, - gdouble *lower, - gdouble *upper, - gdouble *position); -guint gtk_databox_ruler_get_max_length (GtkDataboxRuler *ruler); -GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler *ruler); -void gtk_databox_ruler_set_orientation (GtkDataboxRuler *ruler, - GtkOrientation orientation); -GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler *ruler); - - - - -Object Hierarchy - - GObject - +----GInitiallyUnowned - +----GtkObject - +----GtkWidget - +----GtkDataboxRuler - - - - - - - -Implemented Interfaces - -GtkDataboxRuler implements - AtkImplementorIface and GtkBuildable. - - - - - -Properties - - "lower" gdouble : Read / Write - "max-length" guint : Read / Write - "orientation" guint : Read / Write / Construct Only - "position" gdouble : Read / Write - "upper" gdouble : Read / Write - - - - - - -Description - -GtkDataboxRuler is a widget for the GTK+ library similar to GtkRuler. - - -It is improved in several ways: - - - - - - It supports linear and logarithmic scales. - - - - - In the vertical orientation, the labels are rotated 90° (instead of being written - as a vertical column of horizontal characters). This increases readability. - - - - - It works for very small and very large value ranges. - - - - - - - - - -Details - -GTK_DATABOX_RULER_MAX_MAX_LENGTH -GTK_DATABOX_RULER_MAX_MAX_LENGTH#define GTK_DATABOX_RULER_MAX_MAX_LENGTH 63 - - -The maximum upper limit of label length in characters - - - - -GtkDataboxRulerPrivate -GtkDataboxRulerPrivatetypedef struct _GtkDataboxRulerPrivate GtkDataboxRulerPrivate; - -A private data structure used by the GtkDataboxRuler. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxRuler -GtkDataboxRulertypedef struct _GtkDataboxRuler GtkDataboxRuler; - -An improved version (see above) of GtkRuler which supports linear and logarithmic scales. - - - - -gtk_databox_ruler_new () -gtk_databox_ruler_newGtkWidget* gtk_databox_ruler_new (GtkOrientation orientation); - -Creates a new GtkDataboxRuler widget with the given orientation (horizontal or vertical). - - - -orientation : - orientation of the ruler - -Returns : A new GtkDataboxRuler - - - -gtk_databox_ruler_set_range () -gtk_databox_ruler_set_rangevoid gtk_databox_ruler_set_range (GtkDataboxRuler *ruler, - gdouble lower, - gdouble upper, - gdouble position); - -Sets values indicating the range and current position of a GtkDataboxRuler. - - -See gtk_databox_ruler_get_range(). - - - -ruler : - a GtkDataboxRuler - -lower : - lower limit of the ruler - -upper : - upper limit of the ruler - -position : - current position of the mark on the ruler - - - -gtk_databox_ruler_set_max_length () -gtk_databox_ruler_set_max_lengthvoid gtk_databox_ruler_set_max_length (GtkDataboxRuler *ruler, - guint max_length); - -This function sets the maximum number of digits to be used for each tick -label of the ruler. - - -The max_length cannot be smaller than 2 and not bigger than -GTK_DATABOX_RULER_MAX_MAX_LENGTH. - - - -ruler : - A GtkDataboxRuler widget - -max_length : - Maximum length (digits) of tick labels - - - -gtk_databox_ruler_set_scale_type () -gtk_databox_ruler_set_scale_typevoid gtk_databox_ruler_set_scale_type (GtkDataboxRuler *ruler, - guint scale_type); - -This function sets the scale type of the ruler. - - - -ruler : - A GtkDataboxRuler widget - -scale_type : - The new scale type for ruler (linear or logarithmic) - - - -gtk_databox_ruler_get_range () -gtk_databox_ruler_get_rangevoid gtk_databox_ruler_get_range (GtkDataboxRuler *ruler, - gdouble *lower, - gdouble *upper, - gdouble *position); - -Retrieves values indicating the range and current position of a GtkDataboxRuler. -See gtk_databox_ruler_set_range(). - - - -ruler : - a GtkDataboxRuler - -lower : - location to store lower limit of the ruler, or NULL - -upper : - location to store upper limit of the ruler, or NULL - -position : - location to store the current position of the mark on the ruler, or NULL - - - -gtk_databox_ruler_get_max_length () -gtk_databox_ruler_get_max_lengthguint gtk_databox_ruler_get_max_length (GtkDataboxRuler *ruler); - -This function returns the maximum number of digits to be used for each tick -label of the ruler. - - - -ruler : - A GtkDataboxRuler widget - -Returns : The maximum length of the tick labels. - - - - -gtk_databox_ruler_get_scale_type () -gtk_databox_ruler_get_scale_typeGtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler *ruler); - -This function returns the scale type of the ruler (linear or logarithmic). - - - -ruler : - A GtkDataboxRuler widget - -Returns : The scale type (linear or logarithmic) - - - - -gtk_databox_ruler_set_orientation () -gtk_databox_ruler_set_orientationvoid gtk_databox_ruler_set_orientation (GtkDataboxRuler *ruler, - GtkOrientation orientation); - -Sets the orientation of the ruler (horizontal or vertical). - - - -ruler : - a GtkDataboxRuler - -orientation : - new orientation of the ruler - - - -gtk_databox_ruler_get_orientation () -gtk_databox_ruler_get_orientationGtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler *ruler); - -Gets the orientation of the ruler (horizontal or vertical). - - - -ruler : - a GtkDataboxRuler - -Returns : Orientation of the ruler. - - - - - -Property Details -The <literal>"lower"</literal> property -GtkDataboxRuler:lower "lower" gdouble : Read / Write -Lower limit of ruler.Default value: 0 - -The <literal>"max-length"</literal> property -GtkDataboxRuler:max-length "max-length" guint : Read / Write -Maximum length of the labels (in digits).Allowed values: [2,63] -Default value: 6 - -The <literal>"orientation"</literal> property -GtkDataboxRuler:orientation "orientation" guint : Read / Write / Construct Only -Orientation of the ruler: horizontal or vertical.Allowed values: <= 1 -Default value: 0 - -The <literal>"position"</literal> property -GtkDataboxRuler:position "position" gdouble : Read / Write -Position of mark on the ruler.Default value: 0 - -The <literal>"upper"</literal> property -GtkDataboxRuler:upper "upper" gdouble : Read / Write -Upper limit of ruler.Default value: 0 - - - - - - - -See Also -GtkDatabox - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_scale.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_scale.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_scale.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_scale.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ - - - - -gtkdatabox_scale -3 -GTKDATABOX Library - - - -gtkdatabox_scale - - - - - -Synopsis - - -enum GtkDataboxScaleType; -GType gtk_databox_scale_type_get_type (void); - - - - - - - - - - - - -Description - - - - - - -Details - -enum GtkDataboxScaleType -GtkDataboxScaleTypetypedef enum -{ - GTK_DATABOX_SCALE_LINEAR = 0, - GTK_DATABOX_SCALE_LOG2, - GTK_DATABOX_SCALE_LOG -} -GtkDataboxScaleType; - - -Scale type for GtkDatabox and GtkDataboxRuler objects. - - -See also: "scale_type_x", "scale_type_y" - - - - -GTK_DATABOX_SCALE_LINEAR - Linear scale - - - -GTK_DATABOX_SCALE_LOG2 - - - - -GTK_DATABOX_SCALE_LOG - Logarithmic scale (base 10) - - - - -gtk_databox_scale_type_get_type () -gtk_databox_scale_type_get_typeGType gtk_databox_scale_type_get_type (void); - - - -Returns : - - - - - - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_typedefs.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_typedefs.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_typedefs.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_typedefs.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,272 +0,0 @@ - - - - -gtkdatabox_typedefs -3 -GTKDATABOX Library - - - -gtkdatabox_typedefs - - - - - -Synopsis - - - GtkDatabox; - GtkDataboxGraph; - - - - -Object Hierarchy - - GObject - +----GInitiallyUnowned - +----GtkObject - +----GtkWidget - +----GtkDatabox - - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxGrid - - - - - - - -Implemented Interfaces - -GtkDatabox implements - AtkImplementorIface and GtkBuildable. - - - - - -Properties - - "adjustment-x" GtkAdjustment* : Read / Write / Construct - "adjustment-y" GtkAdjustment* : Read / Write / Construct - "enable-selection" gboolean : Read / Write / Construct - "enable-zoom" gboolean : Read / Write / Construct - "ruler-x" GtkDataboxRuler* : Read / Write / Construct - "ruler-y" GtkDataboxRuler* : Read / Write / Construct - "scale-type-x" GtkDataboxScaleType : Read / Write / Construct - "scale-type-y" GtkDataboxScaleType : Read / Write / Construct - "color" gpointer : Read / Write - "hide" gboolean : Read / Write - "size" gint : Read / Write - - - - -Signals - - "selection-canceled" : Run First - "selection-changed" : Run First - "selection-finalized" : Run First - "selection-started" : Run First - "zoomed" : Run First - - - - - -Description - - - - - - -Details - -GtkDatabox -GtkDataboxtypedef struct _GtkDatabox GtkDatabox; - -A GTK+ widget to display large amounts of numerical data quickly and easily. -The numerical data is represented/displayed by GtkDataboxGraph objects, e.g. -GtkDataboxPoints. - - -Implemented by _GtkDatabox; - - - - - -GtkDataboxGraph -GtkDataboxGraphtypedef struct _GtkDataboxGraph GtkDataboxGraph; - -The GtkDataboxGraph is the base class for all kinds of graphs (e.g. lines, points, decorations like coordinate crosses) -to be shown in a GtkDatabox wiget. - - -Implemented by _GtkDataboxGraph - - - - - - - -Property Details -The <literal>"adjustment-x"</literal> property -GtkDatabox:adjustment-x "adjustment-x" GtkAdjustment* : Read / Write / Construct -GtkAdjustment for horizontal scrolling. -The <literal>"adjustment-y"</literal> property -GtkDatabox:adjustment-y "adjustment-y" GtkAdjustment* : Read / Write / Construct -GtkAdjustment for vertical scrolling. -The <literal>"enable-selection"</literal> property -GtkDatabox:enable-selection "enable-selection" gboolean : Read / Write / Construct - -Defines whether the user can select -rectangular areas with the mouse (TRUE) or not (FALSE). - - -Default value: TRUE - -The <literal>"enable-zoom"</literal> property -GtkDatabox:enable-zoom "enable-zoom" gboolean : Read / Write / Construct - -Defines whether the user can use the mouse to zoom in or out (TRUE) or not (FALSE). - - -Default value: TRUE - -The <literal>"ruler-x"</literal> property -GtkDatabox:ruler-x "ruler-x" GtkDataboxRuler* : Read / Write / Construct -A horizontal GtkDataboxRuler or NULL. -The <literal>"ruler-y"</literal> property -GtkDatabox:ruler-y "ruler-y" GtkDataboxRuler* : Read / Write / Construct -A vertical GtkDataboxRuler or NULL. -The <literal>"scale-type-x"</literal> property -GtkDatabox:scale-type-x "scale-type-x" GtkDataboxScaleType : Read / Write / Construct -Horizontal scale type (linear or logarithmic).Default value: GTK_DATABOX_SCALE_LINEAR - -The <literal>"scale-type-y"</literal> property -GtkDatabox:scale-type-y "scale-type-y" GtkDataboxScaleType : Read / Write / Construct -Vertical scale type (linear or logarithmic).Default value: GTK_DATABOX_SCALE_LINEAR - -The <literal>"color"</literal> property -GtkDataboxGraph:color "color" gpointer : Read / Write -Color of graph. -The <literal>"hide"</literal> property -GtkDataboxGraph:hide "hide" gboolean : Read / Write -Determine if graph is hidden or not.Default value: FALSE - -The <literal>"size"</literal> property -GtkDataboxGraph:size "size" gint : Read / Write -Size of displayed items.Default value: 0 - - - - - -Signal Details -The <literal>"selection-canceled"</literal> signal -GtkDatabox::selection-canceledvoid user_function (GtkDatabox *box, - gpointer user_data) : Run First - -This signal is emitted after a right click outside -a selection rectangle. - - - -box : - The GtkDatabox widget which zoomed in or out. - -user_data : -user data set when the signal handler was connected. -The <literal>"selection-changed"</literal> signal -GtkDatabox::selection-changedvoid user_function (GtkDatabox *box, - gpointer selection_values, - gpointer user_data) : Run First - -This signal is emitted when the mouse is moved -with the left button pressed (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values. - - - -box : - The GtkDatabox widget in which the selection was changed. - -selection_values : - The corners of the selection rectangle. - -user_data : -user data set when the signal handler was connected. -The <literal>"selection-finalized"</literal> signal -GtkDatabox::selection-finalizedvoid user_function (GtkDatabox *box, - gpointer selection_values, - gpointer user_data) : Run First - -This signal is emitted when the left mouse button -is released after a selection was started before. - - -see_also: "selection-changed" - - - -box : - The GtkDatabox widget in which the selection has been stopped. - -selection_values : - The corners of the selection rectangle. - -user_data : -user data set when the signal handler was connected. -The <literal>"selection-started"</literal> signal -GtkDatabox::selection-startedvoid user_function (GtkDatabox *box, - gpointer selection_values, - gpointer user_data) : Run First - -This signal is emitted when the mouse is firstmoved -with the left button pressed after the mouse-down (and the "enable-selection" property -is set). The corners of the selection rectangle are stored in selection_values. - - -see_also: "selection-changed" - - - -box : - The GtkDatabox widget in which the selection has been started. - -selection_values : - The corners of the selection rectangle. - -user_data : -user data set when the signal handler was connected. -The <literal>"zoomed"</literal> signal -GtkDatabox::zoomedvoid user_function (GtkDatabox *box, - gpointer user_data) : Run First - -This signal is emitted each time the zoom of the widget is changed, see for example -gtk_databox_zoom_to_selection(), gtk_databox_set_visible_limits(). - - - -box : - The GtkDatabox widget which zoomed in or out. - -user_data : -user data set when the signal handler was connected. - - - - - - diff -Nru libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_xyc_graph.xml libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_xyc_graph.xml --- libgtkdatabox-0.9.1.1/docs/reference/xml/gtkdatabox_xyc_graph.xml 2009-05-11 00:59:54.000000000 +0000 +++ libgtkdatabox-0.9.2.0/docs/reference/xml/gtkdatabox_xyc_graph.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ - - - - -GtkDataboxXYCGraph -3 -GTKDATABOX Library - - - -GtkDataboxXYCGraph -An abstract anchestor for all graphs which display xy-values in one color. - - - - -Synopsis - - - -#include <gtkdatabox_xyc_graph.h> - - GtkDataboxXYCGraphPrivate; - GtkDataboxXYCGraph; -guint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph *xyc_graph); -gfloat* gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph *xyc_graph); -gfloat* gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph *xyc_graph); - - - - -Object Hierarchy - - GObject - +----GtkDataboxGraph - +----GtkDataboxXYCGraph - +----GtkDataboxPoints - +----GtkDataboxLines - +----GtkDataboxBars - +----GtkDataboxMarkers - - - - - - - - - -Properties - - "X-Values" gpointer : Read / Write / Construct Only - "Y-Values" gpointer : Read / Write / Construct Only - "length" gint : Read / Write / Construct Only - - - - - - -Description - -GtkDataboxXYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented -as an array of X values and a second array of Y values. In order to actually display data, you should -use one of the derived classes. - - - - - - -Details - -GtkDataboxXYCGraphPrivate -GtkDataboxXYCGraphPrivatetypedef struct _GtkDataboxXYCGraphPrivate GtkDataboxXYCGraphPrivate; - -A private data structure used by the GtkDataboxXYCGraph. It shields all internal things -from developers who are just using the object. - - - - -GtkDataboxXYCGraph -GtkDataboxXYCGraphtypedef struct _GtkDataboxXYCGraph GtkDataboxXYCGraph; - -GtkDataboxXYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented -as an array of X values and a second array of Y values. In order to actually display data, you should -use one of the derived classes. - - - - -gtk_databox_xyc_graph_get_length () -gtk_databox_xyc_graph_get_lengthguint gtk_databox_xyc_graph_get_length (GtkDataboxXYCGraph *xyc_graph); - -Gets the the length of the X and Y values arrays. - - - -xyc_graph : - A GtkDataboxXYCGraph object - -Returns : Length of X/Y arrays. - - - -gtk_databox_xyc_graph_get_X () -gtk_databox_xyc_graph_get_Xgfloat* gtk_databox_xyc_graph_get_X (GtkDataboxXYCGraph *xyc_graph); - -Gets the X values of the xzc_graph. - - - -xyc_graph : - A GtkDataboxXYCGraph object - -Returns : Pointer to X values - - - -gtk_databox_xyc_graph_get_Y () -gtk_databox_xyc_graph_get_Ygfloat* gtk_databox_xyc_graph_get_Y (GtkDataboxXYCGraph *xyc_graph); - -Gets the Y values of the xzc_graph. - - - -xyc_graph : - A GtkDataboxXYCGraph object - -Returns : Pointer to Y values - - - - - -Property Details -The <literal>"X-Values"</literal> property -GtkDataboxXYCGraph:X-Values "X-Values" gpointer : Read / Write / Construct Only -X values of data. -The <literal>"Y-Values"</literal> property -GtkDataboxXYCGraph:Y-Values "Y-Values" gpointer : Read / Write / Construct Only -Y values of data. -The <literal>"length"</literal> property -GtkDataboxXYCGraph:length "length" gint : Read / Write / Construct Only -number of data points.Default value: 0 - - - - - - - -See Also -GtkDatabox, GtkDataboxGraph, GtkDataboxPoints, GtkDataboxLines, GtkDataboxBars - - - diff -Nru libgtkdatabox-0.9.1.1/examples/Makefile.am libgtkdatabox-0.9.2.0/examples/Makefile.am --- libgtkdatabox-0.9.1.1/examples/Makefile.am 2009-04-19 22:15:49.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/Makefile.am 2012-10-03 19:28:52.000000000 +0000 @@ -4,6 +4,7 @@ basics\ basics2\ logarithmic\ + rulers\ keycontrol\ colors\ markers\ @@ -11,7 +12,7 @@ grid_array\ signals\ lissajous\ - basics_libglade \ + basics_libglade \ enable_disable\ addremove @@ -22,6 +23,8 @@ logarithmic_SOURCES = logarithmic.c +rulers_SOURCES = rulers.c + keycontrol_SOURCES = keycontrol.c colors_SOURCES = colors.c @@ -58,7 +61,7 @@ LDADD = $(top_builddir)/gtk/libgtkdatabox.la\ - @GTK_LIBS@ + @GTK_LIBS@ if BUILD_LIBGLADE diff -Nru libgtkdatabox-0.9.1.1/examples/Makefile.in libgtkdatabox-0.9.2.0/examples/Makefile.in --- libgtkdatabox-0.9.1.1/examples/Makefile.in 2009-05-11 00:57:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/Makefile.in 2012-11-09 05:04:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -18,8 +19,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -35,10 +37,11 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = basics$(EXEEXT) basics2$(EXEEXT) \ - logarithmic$(EXEEXT) keycontrol$(EXEEXT) colors$(EXEEXT) \ - markers$(EXEEXT) grid$(EXEEXT) grid_array$(EXEEXT) \ - signals$(EXEEXT) lissajous$(EXEEXT) basics_libglade$(EXEEXT) \ - enable_disable$(EXEEXT) addremove$(EXEEXT) + logarithmic$(EXEEXT) rulers$(EXEEXT) keycontrol$(EXEEXT) \ + colors$(EXEEXT) markers$(EXEEXT) grid$(EXEEXT) \ + grid_array$(EXEEXT) signals$(EXEEXT) lissajous$(EXEEXT) \ + basics_libglade$(EXEEXT) enable_disable$(EXEEXT) \ + addremove$(EXEEXT) subdir = examples DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -48,6 +51,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am_addremove_OBJECTS = addremove.$(OBJEXT) addremove_OBJECTS = $(am_addremove_OBJECTS) @@ -101,6 +105,10 @@ markers_OBJECTS = $(am_markers_OBJECTS) markers_LDADD = $(LDADD) markers_DEPENDENCIES = $(top_builddir)/gtk/libgtkdatabox.la +am_rulers_OBJECTS = rulers.$(OBJEXT) +rulers_OBJECTS = $(am_rulers_OBJECTS) +rulers_LDADD = $(LDADD) +rulers_DEPENDENCIES = $(top_builddir)/gtk/libgtkdatabox.la am_signals_OBJECTS = signals.$(OBJEXT) signals_OBJECTS = $(am_signals_OBJECTS) signals_LDADD = $(LDADD) @@ -108,6 +116,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -122,13 +131,13 @@ $(enable_disable_SOURCES) $(grid_SOURCES) \ $(grid_array_SOURCES) $(keycontrol_SOURCES) \ $(lissajous_SOURCES) $(logarithmic_SOURCES) $(markers_SOURCES) \ - $(signals_SOURCES) + $(rulers_SOURCES) $(signals_SOURCES) DIST_SOURCES = $(addremove_SOURCES) $(basics_SOURCES) \ $(basics2_SOURCES) $(basics_libglade_SOURCES) \ $(colors_SOURCES) $(enable_disable_SOURCES) $(grid_SOURCES) \ $(grid_array_SOURCES) $(keycontrol_SOURCES) \ $(lissajous_SOURCES) $(logarithmic_SOURCES) $(markers_SOURCES) \ - $(signals_SOURCES) + $(rulers_SOURCES) $(signals_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -151,6 +160,7 @@ DATABOX_VERSION = @DATABOX_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -163,6 +173,10 @@ GLADE3_LIBS = @GLADE3_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_REQUIRED = @GTK_REQUIRED@ @@ -185,9 +199,11 @@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -196,12 +212,15 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_CFLAGS = @PANGO_CFLAGS@ PANGO_LIBS = @PANGO_LIBS@ PANGO_REQUIRED = @PANGO_REQUIRED@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -212,6 +231,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -247,7 +267,6 @@ libglade_moduledir = @libglade_moduledir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -260,11 +279,13 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ basics_SOURCES = basics.c basics2_SOURCES = basics2.c logarithmic_SOURCES = logarithmic.c +rulers_SOURCES = rulers.c keycontrol_SOURCES = keycontrol.c colors_SOURCES = colors.c markers_SOURCES = markers.c @@ -290,7 +311,7 @@ `pkg-config gtk+-2.0 --cflags` LDADD = $(top_builddir)/gtk/libgtkdatabox.la\ - @GTK_LIBS@ + @GTK_LIBS@ @BUILD_LIBGLADE_FALSE@basics_libglade_LDADD = $(LDADD) @BUILD_LIBGLADE_TRUE@basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \ @@ -306,14 +327,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu examples/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -331,50 +352,56 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): 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 -addremove$(EXEEXT): $(addremove_OBJECTS) $(addremove_DEPENDENCIES) + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +addremove$(EXEEXT): $(addremove_OBJECTS) $(addremove_DEPENDENCIES) $(EXTRA_addremove_DEPENDENCIES) @rm -f addremove$(EXEEXT) $(LINK) $(addremove_OBJECTS) $(addremove_LDADD) $(LIBS) -basics$(EXEEXT): $(basics_OBJECTS) $(basics_DEPENDENCIES) +basics$(EXEEXT): $(basics_OBJECTS) $(basics_DEPENDENCIES) $(EXTRA_basics_DEPENDENCIES) @rm -f basics$(EXEEXT) $(LINK) $(basics_OBJECTS) $(basics_LDADD) $(LIBS) -basics2$(EXEEXT): $(basics2_OBJECTS) $(basics2_DEPENDENCIES) +basics2$(EXEEXT): $(basics2_OBJECTS) $(basics2_DEPENDENCIES) $(EXTRA_basics2_DEPENDENCIES) @rm -f basics2$(EXEEXT) $(LINK) $(basics2_OBJECTS) $(basics2_LDADD) $(LIBS) -basics_libglade$(EXEEXT): $(basics_libglade_OBJECTS) $(basics_libglade_DEPENDENCIES) +basics_libglade$(EXEEXT): $(basics_libglade_OBJECTS) $(basics_libglade_DEPENDENCIES) $(EXTRA_basics_libglade_DEPENDENCIES) @rm -f basics_libglade$(EXEEXT) $(LINK) $(basics_libglade_OBJECTS) $(basics_libglade_LDADD) $(LIBS) -colors$(EXEEXT): $(colors_OBJECTS) $(colors_DEPENDENCIES) +colors$(EXEEXT): $(colors_OBJECTS) $(colors_DEPENDENCIES) $(EXTRA_colors_DEPENDENCIES) @rm -f colors$(EXEEXT) $(LINK) $(colors_OBJECTS) $(colors_LDADD) $(LIBS) -enable_disable$(EXEEXT): $(enable_disable_OBJECTS) $(enable_disable_DEPENDENCIES) +enable_disable$(EXEEXT): $(enable_disable_OBJECTS) $(enable_disable_DEPENDENCIES) $(EXTRA_enable_disable_DEPENDENCIES) @rm -f enable_disable$(EXEEXT) $(LINK) $(enable_disable_OBJECTS) $(enable_disable_LDADD) $(LIBS) -grid$(EXEEXT): $(grid_OBJECTS) $(grid_DEPENDENCIES) +grid$(EXEEXT): $(grid_OBJECTS) $(grid_DEPENDENCIES) $(EXTRA_grid_DEPENDENCIES) @rm -f grid$(EXEEXT) $(LINK) $(grid_OBJECTS) $(grid_LDADD) $(LIBS) -grid_array$(EXEEXT): $(grid_array_OBJECTS) $(grid_array_DEPENDENCIES) +grid_array$(EXEEXT): $(grid_array_OBJECTS) $(grid_array_DEPENDENCIES) $(EXTRA_grid_array_DEPENDENCIES) @rm -f grid_array$(EXEEXT) $(LINK) $(grid_array_OBJECTS) $(grid_array_LDADD) $(LIBS) -keycontrol$(EXEEXT): $(keycontrol_OBJECTS) $(keycontrol_DEPENDENCIES) +keycontrol$(EXEEXT): $(keycontrol_OBJECTS) $(keycontrol_DEPENDENCIES) $(EXTRA_keycontrol_DEPENDENCIES) @rm -f keycontrol$(EXEEXT) $(LINK) $(keycontrol_OBJECTS) $(keycontrol_LDADD) $(LIBS) -lissajous$(EXEEXT): $(lissajous_OBJECTS) $(lissajous_DEPENDENCIES) +lissajous$(EXEEXT): $(lissajous_OBJECTS) $(lissajous_DEPENDENCIES) $(EXTRA_lissajous_DEPENDENCIES) @rm -f lissajous$(EXEEXT) $(LINK) $(lissajous_OBJECTS) $(lissajous_LDADD) $(LIBS) -logarithmic$(EXEEXT): $(logarithmic_OBJECTS) $(logarithmic_DEPENDENCIES) +logarithmic$(EXEEXT): $(logarithmic_OBJECTS) $(logarithmic_DEPENDENCIES) $(EXTRA_logarithmic_DEPENDENCIES) @rm -f logarithmic$(EXEEXT) $(LINK) $(logarithmic_OBJECTS) $(logarithmic_LDADD) $(LIBS) -markers$(EXEEXT): $(markers_OBJECTS) $(markers_DEPENDENCIES) +markers$(EXEEXT): $(markers_OBJECTS) $(markers_DEPENDENCIES) $(EXTRA_markers_DEPENDENCIES) @rm -f markers$(EXEEXT) $(LINK) $(markers_OBJECTS) $(markers_LDADD) $(LIBS) -signals$(EXEEXT): $(signals_OBJECTS) $(signals_DEPENDENCIES) +rulers$(EXEEXT): $(rulers_OBJECTS) $(rulers_DEPENDENCIES) $(EXTRA_rulers_DEPENDENCIES) + @rm -f rulers$(EXEEXT) + $(LINK) $(rulers_OBJECTS) $(rulers_LDADD) $(LIBS) +signals$(EXEEXT): $(signals_OBJECTS) $(signals_DEPENDENCIES) $(EXTRA_signals_DEPENDENCIES) @rm -f signals$(EXEEXT) $(LINK) $(signals_OBJECTS) $(signals_LDADD) $(LIBS) @@ -396,25 +423,26 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lissajous.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logarithmic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rulers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -430,14 +458,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -445,29 +473,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -488,13 +521,17 @@ 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 "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -512,16 +549,22 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -543,6 +586,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -551,18 +596,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -600,6 +655,7 @@ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags 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 -Nru libgtkdatabox-0.9.1.1/examples/addremove.c libgtkdatabox-0.9.2.0/examples/addremove.c --- libgtkdatabox-0.9.1.1/examples/addremove.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/addremove.c 2012-10-03 19:28:52.000000000 +0000 @@ -203,7 +203,7 @@ g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_show_all (window); diff -Nru libgtkdatabox-0.9.1.1/examples/basics.c libgtkdatabox-0.9.2.0/examples/basics.c --- libgtkdatabox-0.9.1.1/examples/basics.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/basics.c 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -73,12 +73,12 @@ label = gtk_label_new - ("\nThe code for this example demonstrates\n the simplest way to use a GtkDatabox widget.\n\nUsage:\nDraw a selection with the left button pressed,\nThan click into the selection.\nUse the right mouse button to zoom out.\nShift+ right mouse button zooms to default."); + ("\nThe code for this example demonstrates\n the simplet way to use a GtkDatabox widget.\n\nUsage:\nDraw a selection with the left button pressed,\nThan click into the selection.\nUse the right mouse button to zoom out.\nShift+ right mouse button zooms to default.\n\nMouse scroll-wheel: \n*Holding Ctrl+ scrollwheel zooms in/out. \nScroll-wheel moves up/down. \n*Holding Alt+ scroll-wheel moves left/right in the plot."); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); separator = gtk_hseparator_new (); gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0); - /* ----------------------------------------------------------------- + /* ----------------------------------------------------------------- * This is all you need: * ----------------------------------------------------------------- */ @@ -101,7 +101,7 @@ gtk_databox_set_total_limits (GTK_DATABOX (box), -1000., 5000., -10000., 23000.); gtk_databox_auto_rescale (GTK_DATABOX (box), 0.05); - /* ----------------------------------------------------------------- + /* ----------------------------------------------------------------- * Done :-) * ----------------------------------------------------------------- */ @@ -113,7 +113,7 @@ g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_grab_focus (close_button); diff -Nru libgtkdatabox-0.9.1.1/examples/basics2.c libgtkdatabox-0.9.2.0/examples/basics2.c --- libgtkdatabox-0.9.1.1/examples/basics2.c 2009-04-19 21:40:55.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/basics2.c 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include #include #include @@ -30,6 +32,8 @@ #define POINTS 2000 #define STEPS 50 #define BARS 25 +#define OFFSET_BARS 25 +#define REGIONS 25 #define MARKER 10 /*---------------------------------------------------------------- @@ -53,6 +57,8 @@ gfloat min_y, max_y; gfloat *X; gfloat *Y; + gfloat *Y1; /* for the offset bars and regions*/ + gfloat *Y2; /* for the offset bars and regions */ gfloat buffer; GdkColor color; gint i; @@ -77,10 +83,10 @@ gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0); - /* Instead of the following stuff, you could also call + /* Instead of the following stuff, you could also call * gtk_databox_create_box_with_scrollbars_and_rulers * as it is done in the other examples. - * Of course, you are more flexible in using scrollbars and rulers + * Of course, you are more flexible in using scrollbars and rulers * by doing it yourself. */ table = gtk_table_new (3, 3, FALSE); box = gtk_databox_new (); @@ -88,7 +94,7 @@ GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); - /* You can associate a scrollbar with a GtkDatabox widget either + /* You can associate a scrollbar with a GtkDatabox widget either * this way ...*/ scrollbar = gtk_hscrollbar_new (NULL); gtk_databox_set_adjustment_x (GTK_DATABOX (box), @@ -168,6 +174,7 @@ X[i] = i * POINTS / BARS; Y[i] = 80. * sin (i * 2 * G_PI / BARS); } + color.red = 0; color.green = 65535; color.blue = 65535; @@ -182,10 +189,44 @@ graph = gtk_databox_cross_simple_new (&color, 0); gtk_databox_graph_add (GTK_DATABOX (box), graph); - /* Instead of doing stuff what you see below, you could call + X = g_new0 (gfloat, OFFSET_BARS); + Y1 = g_new0 (gfloat, OFFSET_BARS); + Y2 = g_new0 (gfloat, OFFSET_BARS); + + for (i = 0; i < OFFSET_BARS; i++) + { + X[i] = (i+0.5) * POINTS / OFFSET_BARS; + Y1[i] = 80. * sin ((i+0.5) * 2 * G_PI / OFFSET_BARS); + Y2[i] = -0.5*(80. * sin ((i+0.5) * 2 * G_PI / OFFSET_BARS)); + } + color.red = 65535; + color.green = 0; + color.blue = 65535; + + graph = gtk_databox_offset_bars_new (BARS, X, Y1, Y2, &color, 1); + gtk_databox_graph_add (GTK_DATABOX (box), graph); + + X = g_new0 (gfloat, REGIONS); + Y1 = g_new0 (gfloat, REGIONS); + Y2 = g_new0 (gfloat, REGIONS); + + for (i = 0; i < REGIONS; i++) + { + X[i] = (i+0.5) * POINTS / REGIONS; + Y1[i] = .5*80. * sin ((i+0.5) * 2 * G_PI / REGIONS); + Y2[i] = .5*-0.5*(80. * sin ((i+0.5) * 2 * G_PI / REGIONS)); + } + color.red = 0.5*65535; + color.green = 0.25*65535; + color.blue = 0.5*65535; + + graph = gtk_databox_regions_new (BARS, X, Y1, Y2, &color); + gtk_databox_graph_add (GTK_DATABOX (box), graph); + + /* Instead of doing stuff what you see below, you could call * gtk_databox_auto_rescale (GTK_DATABOX (box), 0.05); - * as is done in the other examples - * Of course, you are more flexible in adjusting the scaling by doing + * as is done in the other examples + * Of course, you are more flexible in adjusting the scaling by doing * it yourself, though. */ if (0 > gtk_databox_calculate_extrema (GTK_DATABOX (box), &min_x, &max_x, @@ -225,7 +266,7 @@ g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_grab_focus (close_button); diff -Nru libgtkdatabox-0.9.1.1/examples/colors.c libgtkdatabox-0.9.2.0/examples/colors.c --- libgtkdatabox-0.9.1.1/examples/colors.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/colors.c 2012-10-03 19:28:52.000000000 +0000 @@ -194,7 +194,7 @@ g_signal_connect (G_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), (gpointer) NULL); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); diff -Nru libgtkdatabox-0.9.1.1/examples/enable_disable.c libgtkdatabox-0.9.2.0/examples/enable_disable.c --- libgtkdatabox-0.9.1.1/examples/enable_disable.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/enable_disable.c 2012-10-03 19:28:52.000000000 +0000 @@ -145,7 +145,7 @@ g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); for (i = 0; i < noEnableSets; ++i) { GtkWidget *vbox = gtk_vbox_new (FALSE, 10); diff -Nru libgtkdatabox-0.9.1.1/examples/grid.c libgtkdatabox-0.9.2.0/examples/grid.c --- libgtkdatabox-0.9.1.1/examples/grid.c 2009-04-19 21:10:13.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/grid.c 2012-10-03 19:28:52.000000000 +0000 @@ -133,7 +133,7 @@ G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_show_all (window); diff -Nru libgtkdatabox-0.9.1.1/examples/grid_array.c libgtkdatabox-0.9.2.0/examples/grid_array.c --- libgtkdatabox-0.9.1.1/examples/grid_array.c 2009-04-19 21:36:13.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/grid_array.c 2012-10-03 19:28:52.000000000 +0000 @@ -134,7 +134,7 @@ G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_show_all (window); diff -Nru libgtkdatabox-0.9.1.1/examples/keycontrol.c libgtkdatabox-0.9.2.0/examples/keycontrol.c --- libgtkdatabox-0.9.1.1/examples/keycontrol.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/keycontrol.c 2012-10-03 19:28:52.000000000 +0000 @@ -133,7 +133,8 @@ gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table, TRUE, TRUE, TRUE, TRUE); gtk_widget_add_events (box, GDK_KEY_PRESS_MASK); - GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT); + gtk_widget_set_can_focus(box, GTK_CAN_FOCUS); + gtk_widget_set_can_default(box, GTK_CAN_DEFAULT); gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); diff -Nru libgtkdatabox-0.9.1.1/examples/lissajous.c libgtkdatabox-0.9.2.0/examples/lissajous.c --- libgtkdatabox-0.9.1.1/examples/lissajous.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/lissajous.c 2012-10-03 19:28:52.000000000 +0000 @@ -154,7 +154,7 @@ G_CALLBACK (gtk_main_quit), G_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box); diff -Nru libgtkdatabox-0.9.1.1/examples/logarithmic.c libgtkdatabox-0.9.2.0/examples/logarithmic.c --- libgtkdatabox-0.9.1.1/examples/logarithmic.c 2009-04-19 17:58:21.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/logarithmic.c 2012-10-03 19:28:52.000000000 +0000 @@ -207,7 +207,7 @@ g_signal_connect (GTK_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), NULL); gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_grab_focus (close_button); diff -Nru libgtkdatabox-0.9.1.1/examples/markers.c libgtkdatabox-0.9.2.0/examples/markers.c --- libgtkdatabox-0.9.1.1/examples/markers.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/markers.c 2012-10-03 19:28:52.000000000 +0000 @@ -220,7 +220,7 @@ g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); gtk_widget_show_all (window); diff -Nru libgtkdatabox-0.9.1.1/examples/rulers.c libgtkdatabox-0.9.2.0/examples/rulers.c --- libgtkdatabox-0.9.1.1/examples/rulers.c 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/rulers.c 2012-10-03 19:28:52.000000000 +0000 @@ -0,0 +1,275 @@ +/* $Id: logarithmic.c 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 2011 - 2012 Dr. Matt Flax + * + * This program 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 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 Lesser 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. + */ +#include + +#include +#include +#include +#include +#include + +#define POINTS 100000 +/* +#define STEPS 50 +#define BARS 25 +#define MARKER 10 +*/ +#define NO_BOXES 4 + +/*---------------------------------------------------------------- + * databox rulers + *----------------------------------------------------------------*/ + +static void +create_rulers (void) +{ + GtkWidget *window = NULL; + GtkWidget *hbox; + GtkWidget *vbox; + GtkWidget *close_button; + GtkWidget *box[NO_BOXES]; + GtkWidget *label; + GtkWidget *separator; + GtkWidget *table; + GtkDataboxGraph *graph; + gfloat min_x, max_x; + gfloat min_y, max_y; + gfloat *X; + gfloat *Y; + GdkColor color; + gint i; + + guint manual_tick_cnt=4; + gfloat manual_ticks[]={100., 300., 500., 700.}; + + guint manual_tick_cnt_box2=5; + gfloat manual_ticks_box2[]={.01, .1, 1., 10., 100.}; + gchar *manual_tick_labels_box2[]={"these", "are", "manual", "tick", "labels"}; + + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_size_request (window, 1000, 500); + + g_signal_connect (GTK_OBJECT (window), "destroy", + G_CALLBACK (gtk_main_quit), NULL); + + gtk_window_set_title (GTK_WINDOW (window), + "GtkDatabox: Ruler option example plots"); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); + + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (window), vbox); + + label = gtk_label_new + ("demonstrates diferent ruler settings\n"); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); + separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + + label = gtk_label_new ("Rulers on the other side:"); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + + label = gtk_label_new ("Horizontal y axis text\n manual x axis ticks example\n right aligned y text:"); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + + label = gtk_label_new ("Subticks turned off on x and y,\n manual tick labels on x:"); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + + label = gtk_label_new ("X ticks turned off, no shadow\n horizontal y axis text,\n altered y label format example:"); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + + separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0); + + /* Create the databoxes */ + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + + for (i = 0; i < NO_BOXES; ++i) + { + if (i==0 | i==NO_BOXES-1) /* the first is normal but with the rulers on opposite sides to the default */ + gtk_databox_create_box_with_scrollbars_and_rulers_positioned (&box[i], &table,TRUE, TRUE, TRUE,TRUE,FALSE,FALSE); + else + gtk_databox_create_box_with_scrollbars_and_rulers (&box[i], &table,TRUE, TRUE, TRUE,TRUE); + gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0); + } + + /* set box 1's y ruler to have horizontal text */ + GtkDataboxRuler *ruler=gtk_databox_get_ruler_y(GTK_DATABOX (box[1])); + gtk_databox_ruler_set_text_orientation(ruler, GTK_ORIENTATION_HORIZONTAL); + gtk_databox_ruler_set_box_shadow(ruler, GTK_SHADOW_ETCHED_OUT); + gtk_databox_ruler_set_text_alignment (ruler, PANGO_ALIGN_RIGHT); + gtk_databox_set_ruler_y (GTK_DATABOX (box[1]), ruler); + ruler=gtk_databox_get_ruler_x(GTK_DATABOX (box[1])); /* set box 1's x ruler to have manual ticks */ + gtk_databox_ruler_set_manual_tick_cnt(ruler, manual_tick_cnt); + gtk_databox_ruler_set_manual_ticks(ruler, manual_ticks); + gtk_databox_set_ruler_x (GTK_DATABOX (box[1]), ruler); + + /* set box 2 to have no subticks */ + ruler=gtk_databox_get_ruler_y(GTK_DATABOX (box[2])); + gtk_databox_ruler_set_draw_subticks(ruler, FALSE); + gtk_databox_set_ruler_y (GTK_DATABOX (box[2]), ruler); + ruler=gtk_databox_get_ruler_x(GTK_DATABOX (box[2])); /* put manual labels on x */ + gtk_databox_ruler_set_draw_subticks(ruler, FALSE); + gtk_databox_ruler_set_manual_tick_cnt(ruler, manual_tick_cnt_box2); + gtk_databox_ruler_set_manual_ticks(ruler, manual_ticks_box2); + gtk_databox_ruler_set_manual_tick_labels(ruler, manual_tick_labels_box2); + gtk_databox_set_ruler_x (GTK_DATABOX (box[2]), ruler); + + /* set box 3's y ruler to have horizontal text */ + ruler=gtk_databox_get_ruler_y(GTK_DATABOX (box[3])); + gtk_databox_ruler_set_text_orientation(ruler, GTK_ORIENTATION_HORIZONTAL); + gtk_databox_set_ruler_y (GTK_DATABOX (box[3]), ruler); + /* set box 3 to have no x ticks */ + ruler=gtk_databox_get_ruler_x(GTK_DATABOX (box[3])); + gtk_databox_ruler_set_draw_ticks(ruler, FALSE); + /* box[3] to have different shadow on the ruler */ + gtk_databox_ruler_set_box_shadow(ruler, GTK_SHADOW_NONE); + gtk_databox_set_ruler_x (GTK_DATABOX (box[3]), ruler); + ruler=gtk_databox_get_ruler_y(GTK_DATABOX (box[3])); + gtk_databox_ruler_set_draw_subticks(ruler, FALSE); + /* set box[3] to have different formatting */ + gtk_databox_ruler_set_linear_label_format(ruler, "%%-%dg"); + gtk_databox_set_ruler_y (GTK_DATABOX (box[3]), ruler); + + /* set the background */ + color.red = 16383; + color.green = 16383; + color.blue = 16383; + for (i = 0; i < NO_BOXES; ++i) + gtk_widget_modify_bg (box[i], GTK_STATE_NORMAL, &color); + + /* add a sinus^2 */ + X = g_new0 (gfloat, POINTS); + Y = g_new0 (gfloat, POINTS); + + for (i = 0; i < POINTS; i++) + { + X[i] = i / 100.; + Y[i] = 0.01 + 1000 * pow (sin (i * G_PI / POINTS), 2); + } + + color.red = 0; + color.green = 65535; + color.blue = 0; + + graph = gtk_databox_points_new (POINTS, X, Y, &color, 1); + for (i = 0; i < NO_BOXES; ++i) + gtk_databox_graph_add (GTK_DATABOX (box[i]), graph); + + /* add an exp function */ + X = g_new0 (gfloat, POINTS); + Y = g_new0 (gfloat, POINTS); + + for (i = 0; i < POINTS; i++) + { + X[i] = i / 100.; + Y[i] = exp (log (1000) * i / ((gfloat) POINTS)); + } + + color.red = 65535; + color.green = 0; + color.blue = 0; + + graph = gtk_databox_points_new (POINTS, X, Y, &color, 1); + for (i = 0; i < NO_BOXES; ++i) + gtk_databox_graph_add (GTK_DATABOX (box[i]), graph); + + /* add an 1/x function */ + X = g_new0 (gfloat, POINTS); + Y = g_new0 (gfloat, POINTS); + + for (i = 0; i < POINTS; i++) + { + X[i] = i / 100.; + Y[i] = 1000. / (100. * (gfloat) i / POINTS); + } + + color.red = 65535; + color.green = 0; + color.blue = 65535; + + graph = gtk_databox_points_new (POINTS, X, Y, &color, 1); + for (i = 0; i < NO_BOXES; ++i) + gtk_databox_graph_add (GTK_DATABOX (box[i]), graph); + + /* add an x^2 function */ + X = g_new0 (gfloat, POINTS); + Y = g_new0 (gfloat, POINTS); + + for (i = 0; i < POINTS; i++) + { + X[i] = i / 100.; + Y[i] = 1000. * (gfloat) i / POINTS * (gfloat) i / POINTS; + } + + color.red = 65535; + color.green = 65535; + color.blue = 0; + + graph = gtk_databox_points_new (POINTS, X, Y, &color, 1); + for (i = 0; i < NO_BOXES; ++i) + gtk_databox_graph_add (GTK_DATABOX (box[i]), graph); + + /* set the extrema */ + min_x = 0.01; + max_x = 1000.; + min_y = 1000.; + max_y = 0.01; + + for (i = 0; i < NO_BOXES-1; ++i) + gtk_databox_set_total_limits (GTK_DATABOX (box[i]), min_x, max_x, min_y, + max_y); + gtk_databox_set_total_limits (GTK_DATABOX (box[i]), 8, max_x, min_y, + max_y); + + gtk_databox_set_scale_type_y (GTK_DATABOX (box[1]), GTK_DATABOX_SCALE_LOG); + gtk_databox_set_scale_type_x (GTK_DATABOX (box[2]), GTK_DATABOX_SCALE_LOG); + gtk_databox_set_scale_type_y (GTK_DATABOX (box[2]), GTK_DATABOX_SCALE_LOG); + gtk_databox_set_scale_type_x (GTK_DATABOX (box[3]), GTK_DATABOX_SCALE_LOG2); + + separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, TRUE, 0); + + close_button = gtk_button_new_with_label ("close"); + g_signal_connect (GTK_OBJECT (close_button), "clicked", + G_CALLBACK (gtk_main_quit), NULL); + gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); + gtk_widget_grab_default (close_button); + gtk_widget_grab_focus (close_button); + + gtk_widget_show_all (window); + gdk_window_set_cursor (box[0]->window, gdk_cursor_new (GDK_CROSS)); + +} + +gint +main (gint argc, char *argv[]) +{ + gtk_init (&argc, &argv); + + create_rulers(); + gtk_main (); + + return 0; +} diff -Nru libgtkdatabox-0.9.1.1/examples/signals.c libgtkdatabox-0.9.2.0/examples/signals.c --- libgtkdatabox-0.9.1.1/examples/signals.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/examples/signals.c 2012-10-03 19:28:52.000000000 +0000 @@ -287,7 +287,7 @@ g_signal_connect_swapped (G_OBJECT (close_button), "clicked", G_CALLBACK (gtk_main_quit), G_OBJECT (box)); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_grab_default (close_button); g_signal_connect (G_OBJECT (box), "zoomed", diff -Nru libgtkdatabox-0.9.1.1/glade/Makefile.in libgtkdatabox-0.9.2.0/glade/Makefile.in --- libgtkdatabox-0.9.1.1/glade/Makefile.in 2009-05-11 00:57:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/glade/Makefile.in 2012-11-09 05:04:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -19,8 +20,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -44,16 +46,36 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_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__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(glademoduledir)" \ "$(DESTDIR)$(gladeuimoduledir)" "$(DESTDIR)$(catalogsdir)" -glademoduleLTLIBRARIES_INSTALL = $(INSTALL) -gladeuimoduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(glademodule_LTLIBRARIES) $(gladeuimodule_LTLIBRARIES) @BUILD_LIBGLADE_TRUE@libdatabox_la_DEPENDENCIES = \ @BUILD_LIBGLADE_TRUE@ $(top_builddir)/gtk/libgtkdatabox.la @@ -80,6 +102,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -92,7 +115,6 @@ SOURCES = $(libdatabox_la_SOURCES) $(libgladedatabox_la_SOURCES) DIST_SOURCES = $(am__libdatabox_la_SOURCES_DIST) \ $(am__libgladedatabox_la_SOURCES_DIST) -catalogsDATA_INSTALL = $(INSTALL_DATA) DATA = $(catalogs_DATA) ETAGS = etags CTAGS = ctags @@ -116,6 +138,7 @@ DATABOX_VERSION = @DATABOX_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -128,6 +151,10 @@ GLADE3_LIBS = @GLADE3_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_REQUIRED = @GTK_REQUIRED@ @@ -150,9 +177,11 @@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -161,12 +190,15 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_CFLAGS = @PANGO_CFLAGS@ PANGO_LIBS = @PANGO_LIBS@ PANGO_REQUIRED = @PANGO_REQUIRED@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -177,6 +209,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -212,7 +245,6 @@ libglade_moduledir = @libglade_moduledir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -225,6 +257,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -277,14 +310,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glade/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu glade/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glade/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu glade/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -302,23 +335,28 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-glademoduleLTLIBRARIES: $(glademodule_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(glademoduledir)" || $(MKDIR_P) "$(DESTDIR)$(glademoduledir)" - @list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ + @list='$(glademodule_LTLIBRARIES)'; test -n "$(glademoduledir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glademoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glademoduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glademoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glademoduledir)/$$f"; \ + list2="$$list2 $$p"; \ else :; fi; \ - done + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(glademoduledir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(glademoduledir)"; \ + } uninstall-glademoduleLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(glademoduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(glademoduledir)/$$p"; \ + @list='$(glademodule_LTLIBRARIES)'; test -n "$(glademoduledir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(glademoduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(glademoduledir)/$$f"; \ done clean-glademoduleLTLIBRARIES: @@ -332,20 +370,24 @@ install-gladeuimoduleLTLIBRARIES: $(gladeuimodule_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(gladeuimoduledir)" || $(MKDIR_P) "$(DESTDIR)$(gladeuimoduledir)" - @list='$(gladeuimodule_LTLIBRARIES)'; for p in $$list; do \ + @list='$(gladeuimodule_LTLIBRARIES)'; test -n "$(gladeuimoduledir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gladeuimoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gladeuimoduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gladeuimoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gladeuimoduledir)/$$f"; \ + list2="$$list2 $$p"; \ else :; fi; \ - done + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(gladeuimoduledir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(gladeuimoduledir)"; \ + } uninstall-gladeuimoduleLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(gladeuimodule_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(gladeuimoduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(gladeuimoduledir)/$$p"; \ + @list='$(gladeuimodule_LTLIBRARIES)'; test -n "$(gladeuimoduledir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(gladeuimoduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(gladeuimoduledir)/$$f"; \ done clean-gladeuimoduleLTLIBRARIES: @@ -356,9 +398,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libdatabox.la: $(libdatabox_la_OBJECTS) $(libdatabox_la_DEPENDENCIES) +libdatabox.la: $(libdatabox_la_OBJECTS) $(libdatabox_la_DEPENDENCIES) $(EXTRA_libdatabox_la_DEPENDENCIES) $(libdatabox_la_LINK) $(am_libdatabox_la_rpath) $(libdatabox_la_OBJECTS) $(libdatabox_la_LIBADD) $(LIBS) -libgladedatabox.la: $(libgladedatabox_la_OBJECTS) $(libgladedatabox_la_DEPENDENCIES) +libgladedatabox.la: $(libgladedatabox_la_OBJECTS) $(libgladedatabox_la_DEPENDENCIES) $(EXTRA_libgladedatabox_la_DEPENDENCIES) $(libgladedatabox_la_LINK) $(am_libgladedatabox_la_rpath) $(libgladedatabox_la_OBJECTS) $(libgladedatabox_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -372,38 +414,38 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libdatabox_la-glade-databox.lo: glade-databox.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdatabox_la_CFLAGS) $(CFLAGS) -MT libdatabox_la-glade-databox.lo -MD -MP -MF $(DEPDIR)/libdatabox_la-glade-databox.Tpo -c -o libdatabox_la-glade-databox.lo `test -f 'glade-databox.c' || echo '$(srcdir)/'`glade-databox.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libdatabox_la-glade-databox.Tpo $(DEPDIR)/libdatabox_la-glade-databox.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdatabox_la_CFLAGS) $(CFLAGS) -MT libdatabox_la-glade-databox.lo -MD -MP -MF $(DEPDIR)/libdatabox_la-glade-databox.Tpo -c -o libdatabox_la-glade-databox.lo `test -f 'glade-databox.c' || echo '$(srcdir)/'`glade-databox.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdatabox_la-glade-databox.Tpo $(DEPDIR)/libdatabox_la-glade-databox.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='glade-databox.c' object='libdatabox_la-glade-databox.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdatabox_la_CFLAGS) $(CFLAGS) -c -o libdatabox_la-glade-databox.lo `test -f 'glade-databox.c' || echo '$(srcdir)/'`glade-databox.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdatabox_la_CFLAGS) $(CFLAGS) -c -o libdatabox_la-glade-databox.lo `test -f 'glade-databox.c' || echo '$(srcdir)/'`glade-databox.c libgladedatabox_la-gladeui-databox.lo: gladeui-databox.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladedatabox_la_CFLAGS) $(CFLAGS) -MT libgladedatabox_la-gladeui-databox.lo -MD -MP -MF $(DEPDIR)/libgladedatabox_la-gladeui-databox.Tpo -c -o libgladedatabox_la-gladeui-databox.lo `test -f 'gladeui-databox.c' || echo '$(srcdir)/'`gladeui-databox.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgladedatabox_la-gladeui-databox.Tpo $(DEPDIR)/libgladedatabox_la-gladeui-databox.Plo +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladedatabox_la_CFLAGS) $(CFLAGS) -MT libgladedatabox_la-gladeui-databox.lo -MD -MP -MF $(DEPDIR)/libgladedatabox_la-gladeui-databox.Tpo -c -o libgladedatabox_la-gladeui-databox.lo `test -f 'gladeui-databox.c' || echo '$(srcdir)/'`gladeui-databox.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgladedatabox_la-gladeui-databox.Tpo $(DEPDIR)/libgladedatabox_la-gladeui-databox.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gladeui-databox.c' object='libgladedatabox_la-gladeui-databox.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladedatabox_la_CFLAGS) $(CFLAGS) -c -o libgladedatabox_la-gladeui-databox.lo `test -f 'gladeui-databox.c' || echo '$(srcdir)/'`gladeui-databox.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladedatabox_la_CFLAGS) $(CFLAGS) -c -o libgladedatabox_la-gladeui-databox.lo `test -f 'gladeui-databox.c' || echo '$(srcdir)/'`gladeui-databox.c mostlyclean-libtool: -rm -f *.lo @@ -413,34 +455,35 @@ install-catalogsDATA: $(catalogs_DATA) @$(NORMAL_INSTALL) test -z "$(catalogsdir)" || $(MKDIR_P) "$(DESTDIR)$(catalogsdir)" - @list='$(catalogs_DATA)'; for p in $$list; do \ + @list='$(catalogs_DATA)'; test -n "$(catalogsdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(catalogsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(catalogsdir)/$$f'"; \ - $(catalogsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(catalogsdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(catalogsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(catalogsdir)" || exit $$?; \ done uninstall-catalogsDATA: @$(NORMAL_UNINSTALL) - @list='$(catalogs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(catalogsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(catalogsdir)/$$f"; \ - done + @list='$(catalogs_DATA)'; test -n "$(catalogsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(catalogsdir)'; $(am__uninstall_files_from_dir) 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; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -448,29 +491,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -491,13 +539,17 @@ 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 "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -518,16 +570,22 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -549,6 +607,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -558,18 +618,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -613,6 +683,7 @@ uninstall-glademoduleLTLIBRARIES \ uninstall-gladeuimoduleLTLIBRARIES + # 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 -Nru libgtkdatabox-0.9.1.1/gtk/Makefile.am libgtkdatabox-0.9.2.0/gtk/Makefile.am --- libgtkdatabox-0.9.1.1/gtk/Makefile.am 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/Makefile.am 2012-10-03 19:28:52.000000000 +0000 @@ -7,12 +7,15 @@ gtkdatabox_scale.c\ gtkdatabox_graph.c\ gtkdatabox_xyc_graph.c\ + gtkdatabox_xyyc_graph.c\ gtkdatabox_points.c\ - gtkdatabox_lines.c\ - gtkdatabox_bars.c\ + gtkdatabox_lines.c\ + gtkdatabox_bars.c\ + gtkdatabox_offset_bars.c\ + gtkdatabox_regions.c\ gtkdatabox_markers.c\ - gtkdatabox_cross_simple.c\ - gtkdatabox_grid.c\ + gtkdatabox_cross_simple.c\ + gtkdatabox_grid.c\ gtkdatabox_ruler.c libgtkdatabox_la_LDFLAGS= \ @@ -28,12 +31,15 @@ gtkdatabox_scale.h\ gtkdatabox_graph.h\ gtkdatabox_xyc_graph.h\ + gtkdatabox_xyyc_graph.h\ gtkdatabox_points.h\ - gtkdatabox_lines.h\ - gtkdatabox_bars.h\ + gtkdatabox_lines.h\ + gtkdatabox_bars.h\ + gtkdatabox_offset_bars.h\ + gtkdatabox_regions.h\ gtkdatabox_markers.h\ - gtkdatabox_cross_simple.h\ - gtkdatabox_grid.h\ + gtkdatabox_cross_simple.h\ + gtkdatabox_grid.h\ gtkdatabox_ruler.h EXTRA_DIST = gtkdatabox_marshal.list diff -Nru libgtkdatabox-0.9.1.1/gtk/Makefile.in libgtkdatabox-0.9.2.0/gtk/Makefile.in --- libgtkdatabox-0.9.1.1/gtk/Makefile.in 2009-05-11 00:57:46.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/Makefile.in 2012-11-09 05:04:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -19,8 +20,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -45,22 +47,44 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_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__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" -libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libgtkdatabox_la_LIBADD = am_libgtkdatabox_la_OBJECTS = gtkdatabox.lo gtkdatabox_marshal.lo \ gtkdatabox_scale.lo gtkdatabox_graph.lo \ - gtkdatabox_xyc_graph.lo gtkdatabox_points.lo \ - gtkdatabox_lines.lo gtkdatabox_bars.lo gtkdatabox_markers.lo \ - gtkdatabox_cross_simple.lo gtkdatabox_grid.lo \ - gtkdatabox_ruler.lo + gtkdatabox_xyc_graph.lo gtkdatabox_xyyc_graph.lo \ + gtkdatabox_points.lo gtkdatabox_lines.lo gtkdatabox_bars.lo \ + gtkdatabox_offset_bars.lo gtkdatabox_regions.lo \ + gtkdatabox_markers.lo gtkdatabox_cross_simple.lo \ + gtkdatabox_grid.lo gtkdatabox_ruler.lo libgtkdatabox_la_OBJECTS = $(am_libgtkdatabox_la_OBJECTS) libgtkdatabox_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -68,6 +92,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -79,7 +104,6 @@ $(LDFLAGS) -o $@ SOURCES = $(libgtkdatabox_la_SOURCES) DIST_SOURCES = $(libgtkdatabox_la_SOURCES) -includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(include_HEADERS) ETAGS = etags CTAGS = ctags @@ -103,6 +127,7 @@ DATABOX_VERSION = @DATABOX_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -115,6 +140,10 @@ GLADE3_LIBS = @GLADE3_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_REQUIRED = @GTK_REQUIRED@ @@ -137,9 +166,11 @@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -148,12 +179,15 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_CFLAGS = @PANGO_CFLAGS@ PANGO_LIBS = @PANGO_LIBS@ PANGO_REQUIRED = @PANGO_REQUIRED@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -164,6 +198,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -199,7 +234,6 @@ libglade_moduledir = @libglade_moduledir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -212,6 +246,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libgtkdatabox.la @@ -221,12 +256,15 @@ gtkdatabox_scale.c\ gtkdatabox_graph.c\ gtkdatabox_xyc_graph.c\ + gtkdatabox_xyyc_graph.c\ gtkdatabox_points.c\ - gtkdatabox_lines.c\ - gtkdatabox_bars.c\ + gtkdatabox_lines.c\ + gtkdatabox_bars.c\ + gtkdatabox_offset_bars.c\ + gtkdatabox_regions.c\ gtkdatabox_markers.c\ - gtkdatabox_cross_simple.c\ - gtkdatabox_grid.c\ + gtkdatabox_cross_simple.c\ + gtkdatabox_grid.c\ gtkdatabox_ruler.c libgtkdatabox_la_LDFLAGS = \ @@ -241,12 +279,15 @@ gtkdatabox_scale.h\ gtkdatabox_graph.h\ gtkdatabox_xyc_graph.h\ + gtkdatabox_xyyc_graph.h\ gtkdatabox_points.h\ - gtkdatabox_lines.h\ - gtkdatabox_bars.h\ + gtkdatabox_lines.h\ + gtkdatabox_bars.h\ + gtkdatabox_offset_bars.h\ + gtkdatabox_regions.h\ gtkdatabox_markers.h\ - gtkdatabox_cross_simple.h\ - gtkdatabox_grid.h\ + gtkdatabox_cross_simple.h\ + gtkdatabox_grid.h\ gtkdatabox_ruler.h EXTRA_DIST = gtkdatabox_marshal.list @@ -273,14 +314,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gtk/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -298,23 +339,28 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + list2="$$list2 $$p"; \ else :; fi; \ - done + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ done clean-libLTLIBRARIES: @@ -325,7 +371,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgtkdatabox.la: $(libgtkdatabox_la_OBJECTS) $(libgtkdatabox_la_DEPENDENCIES) +libgtkdatabox.la: $(libgtkdatabox_la_OBJECTS) $(libgtkdatabox_la_DEPENDENCIES) $(EXTRA_libgtkdatabox_la_DEPENDENCIES) $(libgtkdatabox_la_LINK) -rpath $(libdir) $(libgtkdatabox_la_OBJECTS) $(libgtkdatabox_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -342,28 +388,31 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_lines.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_markers.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_offset_bars.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_points.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_regions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_ruler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_scale.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_xyc_graph.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdatabox_xyyc_graph.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -376,34 +425,35 @@ install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ done uninstall-includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ - done + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) 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; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -411,29 +461,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -454,13 +509,17 @@ 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 "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -483,16 +542,22 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -515,6 +580,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -523,18 +590,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-libLTLIBRARIES install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -557,7 +634,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool ctags distclean \ @@ -580,6 +657,7 @@ $(srcdir)/gtkdatabox_marshal.h: $(srcdir)/gtkdatabox_marshal.list glib-genmarshal --header --prefix=gtk_databox_marshal --internal $< > $@ + # 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 -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox.c 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -28,25 +28,27 @@ static gint gtk_databox_button_press (GtkWidget * widget, - GdkEventButton * event); + GdkEventButton * event); +static gint gtk_databox_scroll_event (GtkWidget *widget, + GdkEventScroll *event); static gint gtk_databox_button_release (GtkWidget * widget, - GdkEventButton * event); + GdkEventButton * event); static gint gtk_databox_motion_notify (GtkWidget * widget, - GdkEventMotion * event); + GdkEventMotion * event); static void gtk_databox_realize (GtkWidget * widget); static void gtk_databox_unrealize (GtkWidget * widget); static void gtk_databox_size_allocate (GtkWidget * widget, - GtkAllocation * allocation); + GtkAllocation * allocation); static gint gtk_databox_expose (GtkWidget * widget, - GdkEventExpose * event); + GdkEventExpose * event); static void gtk_databox_set_property (GObject * object, - guint prop_id, - const GValue * value, - GParamSpec * pspec); + guint prop_id, + const GValue * value, + GParamSpec * pspec); static void gtk_databox_get_property (GObject * object, - guint prop_id, - GValue * value, - GParamSpec * pspec); + guint prop_id, + GValue * value, + GParamSpec * pspec); static gfloat gtk_databox_get_offset_x (GtkDatabox* box); static gfloat gtk_databox_get_page_size_x (GtkDatabox* box); @@ -56,20 +58,20 @@ static void gtk_databox_create_backing_pixmap (GtkDatabox * box); static void gtk_databox_calculate_selection_values (GtkDatabox * box); static void gtk_databox_selection_cancel (GtkDatabox * box); +static void gtk_databox_zoomed (GtkDatabox * box); static void gtk_databox_draw_selection (GtkDatabox * box, - GdkRectangle * pixmapCopyRect); + GdkRectangle * pixmapCopyRect); static void gtk_databox_adjustment_value_changed (GtkDatabox * box); static void gtk_databox_ruler_update (GtkDatabox * box); /* IDs of signals */ -enum -{ - ZOOMED_SIGNAL, - SELECTION_STARTED_SIGNAL, - SELECTION_CHANGED_SIGNAL, - SELECTION_FINALIZED_SIGNAL, - SELECTION_CANCELED_SIGNAL, - LAST_SIGNAL +enum { + ZOOMED_SIGNAL, + SELECTION_STARTED_SIGNAL, + SELECTION_CHANGED_SIGNAL, + SELECTION_FINALIZED_SIGNAL, + SELECTION_CANCELED_SIGNAL, + LAST_SIGNAL }; /* signals will be configured during class_init */ @@ -77,61 +79,62 @@ /* IDs of properties */ -enum -{ - ENABLE_SELECTION = 1, - ENABLE_ZOOM, - ADJUSTMENT_X, - ADJUSTMENT_Y, - RULER_X, - RULER_Y, - SCALE_TYPE_X, - SCALE_TYPE_Y, - LAST_PROPERTY +enum { + ENABLE_SELECTION = 1, + ENABLE_ZOOM, + ADJUSTMENT_X, + ADJUSTMENT_Y, + RULER_X, + RULER_Y, + SCALE_TYPE_X, + SCALE_TYPE_Y, + BOX_SHADOW, + LAST_PROPERTY }; -struct _GtkDataboxPrivate -{ - GdkPixmap *backing_pixmap; - - /* Total and visible limits (values, not pixels) */ - gfloat total_left; - gfloat total_right; - gfloat total_top; - gfloat total_bottom; - gfloat visible_left; - gfloat visible_right; - gfloat visible_top; - gfloat visible_bottom; - - /* Translation information between values and pixels */ - GtkDataboxScaleType scale_type_x; - GtkDataboxScaleType scale_type_y; - gfloat translation_factor_x; - gfloat translation_factor_y; - - /* Properties */ - gboolean enable_selection; - gboolean enable_zoom; - GtkAdjustment *adj_x; - GtkAdjustment *adj_y; - GtkDataboxRuler *ruler_x; - GtkDataboxRuler *ruler_y; - - /* Other private stuff */ - GList *graphs; - GdkGC *select_gc; - GdkPoint marked; - GdkPoint select; - GtkDataboxValueRectangle selectionValues; - gfloat zoom_limit; - - /* flags */ - gboolean selection_active; - gboolean selection_finalized; +struct _GtkDataboxPrivate { + GdkPixmap *backing_pixmap; + + /* Total and visible limits (values, not pixels) */ + gfloat total_left; + gfloat total_right; + gfloat total_top; + gfloat total_bottom; + gfloat visible_left; + gfloat visible_right; + gfloat visible_top; + gfloat visible_bottom; + + /* Translation information between values and pixels */ + GtkDataboxScaleType scale_type_x; + GtkDataboxScaleType scale_type_y; + gfloat translation_factor_x; + gfloat translation_factor_y; + + /* Properties */ + gboolean enable_selection; + gboolean enable_zoom; + GtkAdjustment *adj_x; + GtkAdjustment *adj_y; + GtkDataboxRuler *ruler_x; + GtkDataboxRuler *ruler_y; + + /* Other private stuff */ + GList *graphs; + GdkGC *select_gc; + GdkPoint marked; + GdkPoint select; + GtkDataboxValueRectangle selectionValues; + gfloat zoom_limit; + + /* flags */ + gboolean selection_active; + gboolean selection_finalized; + + GtkShadowType box_shadow; /* The type of shadow drawn on the pixmap edge */ }; -/** +/** * gtk_databox_get_type * * Determines the #GType of the GtkDatabox widget type. @@ -142,276 +145,288 @@ G_DEFINE_TYPE (GtkDatabox, gtk_databox, GTK_TYPE_WIDGET) static void -gtk_databox_class_init (GtkDataboxClass * class) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - - gobject_class = G_OBJECT_CLASS (class); - widget_class = (GtkWidgetClass *) class; - - gobject_class->set_property = gtk_databox_set_property; - gobject_class->get_property = gtk_databox_get_property; - - widget_class->realize = gtk_databox_realize; - widget_class->unrealize = gtk_databox_unrealize; - widget_class->size_allocate = gtk_databox_size_allocate; - widget_class->expose_event = gtk_databox_expose; - widget_class->motion_notify_event = gtk_databox_motion_notify; - widget_class->button_press_event = gtk_databox_button_press; - widget_class->button_release_event = gtk_databox_button_release; - - /** - * GtkDatabox:enable-selection: - * - * Defines whether the user can select - * rectangular areas with the mouse (#TRUE) or not (#FALSE). - * - */ - g_object_class_install_property (gobject_class, - ENABLE_SELECTION, - g_param_spec_boolean ("enable-selection", - "Enable Selection", - "Enable selection of areas via mouse (TRUE/FALSE)", - TRUE, /* default value */ - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:enable-zoom: - * - * Defines whether the user can use the mouse to zoom in or out (#TRUE) or not (#FALSE). - * - */ - g_object_class_install_property (gobject_class, - ENABLE_ZOOM, - g_param_spec_boolean ("enable-zoom", - "Enable Zoom", - "Enable zooming in or out via mouse click (TRUE/FALSE)", - TRUE, /* default value */ - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:adjustment_x: - * - * The #GtkAdjustment associated with the horizontal scrollbar. The #GtkDatabox widget - * creates a GtkAdjustment itself. Normally there is no need for you to create another - * GtkAdjustment. You could simply use the one you get via gtk_databox_get_adjustment_x(). - * - */ - g_object_class_install_property (gobject_class, - ADJUSTMENT_X, - g_param_spec_object ("adjustment-x", - "Horizontal Adjustment", - "GtkAdjustment for horizontal scrolling", - GTK_TYPE_ADJUSTMENT, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:adjustment_y: - * - * The #GtkAdjustment associated with the vertical scrollbar. The #GtkDatabox widget - * creates a GtkAdjustment itself. Normally there is no need for you to create another - * GtkAdjustment. You could simply use the one you get via gtk_databox_get_adjustment_y(). - * - */ - g_object_class_install_property (gobject_class, - ADJUSTMENT_Y, - g_param_spec_object ("adjustment-y", - "Vertical Adjustment", - "GtkAdjustment for vertical scrolling", - GTK_TYPE_ADJUSTMENT, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:ruler_x: - * - * The horizontal %GtkDataboxRuler (or NULL). - * - */ - g_object_class_install_property (gobject_class, - RULER_X, - g_param_spec_object ("ruler-x", - "Horizontal Ruler", - "A horizontal GtkDataboxRuler or NULL", - GTK_DATABOX_TYPE_RULER, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:ruler_y: - * - * The vertical %GtkDataboxRuler (or NULL). - * - */ - g_object_class_install_property (gobject_class, - RULER_Y, - g_param_spec_object ("ruler-y", - "Vertical Ruler", - "A vertical GtkDataboxRuler or NULL", - GTK_DATABOX_TYPE_RULER, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:scale_type_x: - * - * The horizontal scale type (linear or lograrithmic). - */ - g_object_class_install_property (gobject_class, - SCALE_TYPE_X, - g_param_spec_enum ("scale-type-x", - "Horizontal scale type", - "Horizontal scale type (linear or logarithmic)", - gtk_databox_scale_type_get_type (), - GTK_DATABOX_SCALE_LINEAR, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - /** - * GtkDatabox:scale_type_y: - * - * The vertical scale type (linear or lograrithmic). - */ - g_object_class_install_property (gobject_class, - SCALE_TYPE_Y, - g_param_spec_enum ("scale-type-y", - "Vertical scale type", - "Vertical scale type (linear or logarithmic)", - gtk_databox_scale_type_get_type (), - GTK_DATABOX_SCALE_LINEAR, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - - /** - * GtkDatabox::zoomed: - * @box: The #GtkDatabox widget which zoomed in or out. - * - * This signal is emitted each time the zoom of the widget is changed, see for example - * gtk_databox_zoom_to_selection(), gtk_databox_set_visible_limits(). - */ - gtk_databox_signals[ZOOMED_SIGNAL] = - g_signal_new ("zoomed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkDataboxClass, zoomed), - NULL, /* accumulator */ - NULL, /* accumulator_data */ - gtk_databox_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - /** - * GtkDatabox::selection-started: - * @box: The #GtkDatabox widget in which the selection has been started. - * @selection_values: The corners of the selection rectangle. - * - * This signal is emitted when the mouse is firstmoved - * with the left button pressed after the mouse-down (and the #GtkDatabox:enable-selection property - * is set). The corners of the selection rectangle are stored in @selection_values. - * - * @see_also: #GtkDatabox::selection-changed - */ - gtk_databox_signals[SELECTION_STARTED_SIGNAL] = - g_signal_new ("selection-started", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkDataboxClass, selection_started), - NULL, /* accumulator */ - NULL, /* accumulator_data */ - gtk_databox_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, - G_TYPE_POINTER); - - /** - * GtkDatabox::selection-changed: - * @box: The #GtkDatabox widget in which the selection was changed. - * @selection_values: The corners of the selection rectangle. - * - * This signal is emitted when the mouse is moved - * with the left button pressed (and the #GtkDatabox:enable-selection property - * is set). The corners of the selection rectangle are stored in @selection_values. - */ - gtk_databox_signals[SELECTION_CHANGED_SIGNAL] = - g_signal_new ("selection-changed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkDataboxClass, selection_changed), - NULL, /* accumulator */ - NULL, /* accumulator_data */ - gtk_databox_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, - G_TYPE_POINTER); - - /** - * GtkDatabox::selection-finalized: - * @box: The #GtkDatabox widget in which the selection has been stopped. - * @selection_values: The corners of the selection rectangle. - * - * This signal is emitted when the left mouse button - * is released after a selection was started before. - * - * @see_also: #GtkDatabox::selection-changed - */ - gtk_databox_signals[SELECTION_FINALIZED_SIGNAL] = - g_signal_new ("selection-finalized", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkDataboxClass, selection_finalized), - NULL, /* accumulator */ - NULL, /* accumulator_data */ - gtk_databox_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, - G_TYPE_POINTER); - - /** - * GtkDatabox::selection-canceled: - * @box: The #GtkDatabox widget which zoomed in or out. - * - * This signal is emitted after a right click outside - * a selection rectangle. - */ - gtk_databox_signals[SELECTION_CANCELED_SIGNAL] = - g_signal_new ("selection-canceled", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkDataboxClass, selection_canceled), - NULL, /* accumulator */ - NULL, /* accumulator_data */ - gtk_databox_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - class->zoomed = NULL; - class->selection_started = NULL; - class->selection_changed = NULL; - class->selection_finalized = NULL; - class->selection_canceled = NULL; +gtk_databox_class_init (GtkDataboxClass * class) { + GObjectClass *gobject_class; + GtkWidgetClass *widget_class; + + gobject_class = G_OBJECT_CLASS (class); + widget_class = (GtkWidgetClass *) class; + + gobject_class->set_property = gtk_databox_set_property; + gobject_class->get_property = gtk_databox_get_property; + + widget_class->realize = gtk_databox_realize; + widget_class->unrealize = gtk_databox_unrealize; + widget_class->size_allocate = gtk_databox_size_allocate; + widget_class->expose_event = gtk_databox_expose; + widget_class->motion_notify_event = gtk_databox_motion_notify; + widget_class->button_press_event = gtk_databox_button_press; + widget_class->button_release_event = gtk_databox_button_release; + widget_class->scroll_event = gtk_databox_scroll_event; + + /** + * GtkDatabox:enable-selection: + * + * Defines whether the user can select + * rectangular areas with the mouse (#TRUE) or not (#FALSE). + * + */ + g_object_class_install_property (gobject_class, + ENABLE_SELECTION, + g_param_spec_boolean ("enable-selection", + "Enable Selection", + "Enable selection of areas via mouse (TRUE/FALSE)", + TRUE, /* default value */ + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:enable-zoom: + * + * Defines whether the user can use the mouse to zoom in or out (#TRUE) or not (#FALSE). + * + */ + g_object_class_install_property (gobject_class, + ENABLE_ZOOM, + g_param_spec_boolean ("enable-zoom", + "Enable Zoom", + "Enable zooming in or out via mouse click (TRUE/FALSE)", + TRUE, /* default value */ + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:adjustment_x: + * + * The #GtkAdjustment associated with the horizontal scrollbar. The #GtkDatabox widget + * creates a GtkAdjustment itself. Normally there is no need for you to create another + * GtkAdjustment. You could simply use the one you get via gtk_databox_get_adjustment_x(). + * + */ + g_object_class_install_property (gobject_class, + ADJUSTMENT_X, + g_param_spec_object ("adjustment-x", + "Horizontal Adjustment", + "GtkAdjustment for horizontal scrolling", + GTK_TYPE_ADJUSTMENT, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:adjustment_y: + * + * The #GtkAdjustment associated with the vertical scrollbar. The #GtkDatabox widget + * creates a GtkAdjustment itself. Normally there is no need for you to create another + * GtkAdjustment. You could simply use the one you get via gtk_databox_get_adjustment_y(). + * + */ + g_object_class_install_property (gobject_class, + ADJUSTMENT_Y, + g_param_spec_object ("adjustment-y", + "Vertical Adjustment", + "GtkAdjustment for vertical scrolling", + GTK_TYPE_ADJUSTMENT, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:ruler_x: + * + * The horizontal %GtkDataboxRuler (or NULL). + * + */ + g_object_class_install_property (gobject_class, + RULER_X, + g_param_spec_object ("ruler-x", + "Horizontal Ruler", + "A horizontal GtkDataboxRuler or NULL", + GTK_DATABOX_TYPE_RULER, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:ruler_y: + * + * The vertical %GtkDataboxRuler (or NULL). + * + */ + g_object_class_install_property (gobject_class, + RULER_Y, + g_param_spec_object ("ruler-y", + "Vertical Ruler", + "A vertical GtkDataboxRuler or NULL", + GTK_DATABOX_TYPE_RULER, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:scale_type_x: + * + * The horizontal scale type (linear or lograrithmic). + */ + g_object_class_install_property (gobject_class, + SCALE_TYPE_X, + g_param_spec_enum ("scale-type-x", + "Horizontal scale type", + "Horizontal scale type (linear or logarithmic)", + gtk_databox_scale_type_get_type (), + GTK_DATABOX_SCALE_LINEAR, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + /** + * GtkDatabox:scale_type_y: + * + * The vertical scale type (linear or lograrithmic). + */ + g_object_class_install_property (gobject_class, + SCALE_TYPE_Y, + g_param_spec_enum ("scale-type-y", + "Vertical scale type", + "Vertical scale type (linear or logarithmic)", + gtk_databox_scale_type_get_type (), + GTK_DATABOX_SCALE_LINEAR, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); + + + g_object_class_install_property (gobject_class, + BOX_SHADOW, + g_param_spec_uint ("box-shadow", + "Box Shadow", + "Style of the box shadow: GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT", + GTK_SHADOW_NONE, + GTK_SHADOW_ETCHED_OUT, + GTK_SHADOW_NONE, + G_PARAM_READWRITE)); + + /** + * GtkDatabox::zoomed: + * @box: The #GtkDatabox widget which zoomed in or out. + * + * This signal is emitted each time the zoom of the widget is changed, see for example + * gtk_databox_zoom_to_selection(), gtk_databox_set_visible_limits(). + */ + gtk_databox_signals[ZOOMED_SIGNAL] = + g_signal_new ("zoomed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkDataboxClass, zoomed), + NULL, /* accumulator */ + NULL, /* accumulator_data */ + gtk_databox_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + /** + * GtkDatabox::selection-started: + * @box: The #GtkDatabox widget in which the selection has been started. + * @selection_values: The corners of the selection rectangle. + * + * This signal is emitted when the mouse is firstmoved + * with the left button pressed after the mouse-down (and the #GtkDatabox:enable-selection property + * is set). The corners of the selection rectangle are stored in @selection_values. + * + * @see_also: #GtkDatabox::selection-changed + */ + gtk_databox_signals[SELECTION_STARTED_SIGNAL] = + g_signal_new ("selection-started", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkDataboxClass, selection_started), + NULL, /* accumulator */ + NULL, /* accumulator_data */ + gtk_databox_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); + + /** + * GtkDatabox::selection-changed: + * @box: The #GtkDatabox widget in which the selection was changed. + * @selection_values: The corners of the selection rectangle. + * + * This signal is emitted when the mouse is moved + * with the left button pressed (and the #GtkDatabox:enable-selection property + * is set). The corners of the selection rectangle are stored in @selection_values. + */ + gtk_databox_signals[SELECTION_CHANGED_SIGNAL] = + g_signal_new ("selection-changed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkDataboxClass, selection_changed), + NULL, /* accumulator */ + NULL, /* accumulator_data */ + gtk_databox_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); + + /** + * GtkDatabox::selection-finalized: + * @box: The #GtkDatabox widget in which the selection has been stopped. + * @selection_values: The corners of the selection rectangle. + * + * This signal is emitted when the left mouse button + * is released after a selection was started before. + * + * @see_also: #GtkDatabox::selection-changed + */ + gtk_databox_signals[SELECTION_FINALIZED_SIGNAL] = + g_signal_new ("selection-finalized", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkDataboxClass, selection_finalized), + NULL, /* accumulator */ + NULL, /* accumulator_data */ + gtk_databox_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); + + /** + * GtkDatabox::selection-canceled: + * @box: The #GtkDatabox widget which zoomed in or out. + * + * This signal is emitted after a right click outside + * a selection rectangle. + */ + gtk_databox_signals[SELECTION_CANCELED_SIGNAL] = + g_signal_new ("selection-canceled", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkDataboxClass, selection_canceled), + NULL, /* accumulator */ + NULL, /* accumulator_data */ + gtk_databox_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + class->zoomed = NULL; + class->selection_started = NULL; + class->selection_changed = NULL; + class->selection_finalized = NULL; + class->selection_canceled = NULL; + + } static void -gtk_databox_init (GtkDatabox * box) -{ - box->priv = g_new0 (GtkDataboxPrivate, 1); - box->priv->backing_pixmap = NULL; - box->priv->scale_type_x = GTK_DATABOX_SCALE_LINEAR; - box->priv->scale_type_y = GTK_DATABOX_SCALE_LINEAR; - box->priv->translation_factor_x = 0; - box->priv->translation_factor_y = 0; - box->priv->enable_selection = TRUE; - box->priv->enable_zoom = TRUE; - box->priv->ruler_x = NULL; - box->priv->ruler_y = NULL; - box->priv->graphs = NULL; - box->priv->select_gc = NULL; - box->priv->zoom_limit = 0.01; - box->priv->selection_active = FALSE; - box->priv->selection_finalized = FALSE; - - gtk_databox_set_adjustment_x (box, NULL); - gtk_databox_set_adjustment_y (box, NULL); - gtk_databox_set_total_limits(box, -1., 1., 1., -1.); +gtk_databox_init (GtkDatabox * box) { + box->priv = g_new0 (GtkDataboxPrivate, 1); + box->priv->backing_pixmap = NULL; + box->priv->scale_type_x = GTK_DATABOX_SCALE_LINEAR; + box->priv->scale_type_y = GTK_DATABOX_SCALE_LINEAR; + box->priv->translation_factor_x = 0; + box->priv->translation_factor_y = 0; + box->priv->enable_selection = TRUE; + box->priv->enable_zoom = TRUE; + box->priv->ruler_x = NULL; + box->priv->ruler_y = NULL; + box->priv->graphs = NULL; + box->priv->select_gc = NULL; + box->priv->zoom_limit = 0.01; + box->priv->selection_active = FALSE; + box->priv->selection_finalized = FALSE; + box->priv->box_shadow=GTK_SHADOW_NONE; + + gtk_databox_set_adjustment_x (box, NULL); + gtk_databox_set_adjustment_y (box, NULL); + gtk_databox_set_total_limits(box, -1., 1., 1., -1.); } -/** +/** * gtk_databox_new * * Creates a new #GtkDatabox widget. @@ -420,226 +435,220 @@ * */ GtkWidget * -gtk_databox_new (void) -{ - return g_object_new (GTK_TYPE_DATABOX, NULL); +gtk_databox_new (void) { + return g_object_new (GTK_TYPE_DATABOX, NULL); } static gint -gtk_databox_motion_notify (GtkWidget * widget, GdkEventMotion * event) -{ - GtkDatabox *box; - GdkModifierType state; - gint x; - gint y; - - box = GTK_DATABOX (widget); - - if (event->is_hint) - { - gdk_window_get_pointer (widget->window, &x, &y, &state); - } - else - { - state = event->state; - x = event->x; - y = event->y; - } - - if (state & GDK_BUTTON1_MASK - && box->priv->enable_selection && !box->priv->selection_finalized) - { - GdkRectangle rect; - gint width; - gint height; - - gdk_drawable_get_size (widget->window, &width, &height); - x = MAX (0, MIN (width - 1, x)); - y = MAX (0, MIN (height - 1, y)); - - if (box->priv->selection_active) - { - /* Clear current selection from backing_pixmap */ - gtk_databox_draw_selection (box, NULL); - } - else - { - box->priv->selection_active = TRUE; - box->priv->marked.x = x; - box->priv->marked.y = y; - box->priv->select.x = x; - box->priv->select.y = y; - gtk_databox_calculate_selection_values (box); - g_signal_emit (G_OBJECT (box), - gtk_databox_signals[SELECTION_STARTED_SIGNAL], 0, - &box->priv->selectionValues); - } - - /* Determine the exposure rectangle (covering old selection and new) */ - rect.x = MIN (MIN (box->priv->marked.x, box->priv->select.x), x); - rect.y = MIN (MIN (box->priv->marked.y, box->priv->select.y), y); - rect.width = MAX (MAX (box->priv->marked.x, box->priv->select.x), x) - - rect.x + 1; - rect.height = MAX (MAX (box->priv->marked.y, box->priv->select.y), y) - - rect.y + 1; - - box->priv->select.x = x; - box->priv->select.y = y; - - /* Draw new selection */ - gtk_databox_draw_selection (box, &rect); - - gtk_databox_calculate_selection_values (box); - g_signal_emit (G_OBJECT (box), - gtk_databox_signals[SELECTION_CHANGED_SIGNAL], - 0, &box->priv->selectionValues); - } +gtk_databox_motion_notify (GtkWidget * widget, GdkEventMotion * event) { + GtkDatabox *box; + GdkModifierType state; + gint x; + gint y; + + box = GTK_DATABOX (widget); + + if (event->is_hint) { + gdk_window_get_pointer (widget->window, &x, &y, &state); + } else { + state = event->state; + x = event->x; + y = event->y; + } + + if (state & GDK_BUTTON1_MASK + && box->priv->enable_selection && !box->priv->selection_finalized) { + GdkRectangle rect; + gint width; + gint height; + + width = gdk_window_get_width(widget->window); + height = gdk_window_get_height(widget->window); + x = MAX (0, MIN (width - 1, x)); + y = MAX (0, MIN (height - 1, y)); + + if (box->priv->selection_active) { + /* Clear current selection from backing_pixmap */ + gtk_databox_draw_selection (box, NULL); + } else { + box->priv->selection_active = TRUE; + box->priv->marked.x = x; + box->priv->marked.y = y; + box->priv->select.x = x; + box->priv->select.y = y; + gtk_databox_calculate_selection_values (box); + g_signal_emit (G_OBJECT (box), + gtk_databox_signals[SELECTION_STARTED_SIGNAL], 0, + &box->priv->selectionValues); + } + + /* Determine the exposure rectangle (covering old selection and new) */ + rect.x = MIN (MIN (box->priv->marked.x, box->priv->select.x), x); + rect.y = MIN (MIN (box->priv->marked.y, box->priv->select.y), y); + rect.width = MAX (MAX (box->priv->marked.x, box->priv->select.x), x) + - rect.x + 1; + rect.height = MAX (MAX (box->priv->marked.y, box->priv->select.y), y) + - rect.y + 1; + + box->priv->select.x = x; + box->priv->select.y = y; + + /* Draw new selection */ + gtk_databox_draw_selection (box, &rect); + + gtk_databox_calculate_selection_values (box); + g_signal_emit (G_OBJECT (box), + gtk_databox_signals[SELECTION_CHANGED_SIGNAL], + 0, &box->priv->selectionValues); + } - return FALSE; + return FALSE; } static void gtk_databox_set_property (GObject * object, - guint property_id, - const GValue * value, GParamSpec * pspec) -{ - GtkDatabox *box = GTK_DATABOX (object); - - switch (property_id) - { - case ENABLE_SELECTION: - gtk_databox_set_enable_selection (box, g_value_get_boolean (value)); - break; - case ENABLE_ZOOM: - gtk_databox_set_enable_zoom (box, g_value_get_boolean (value)); - break; - case ADJUSTMENT_X: - gtk_databox_set_adjustment_x (box, g_value_get_object (value)); - break; - case ADJUSTMENT_Y: - gtk_databox_set_adjustment_y (box, g_value_get_object (value)); - break; - case RULER_X: - gtk_databox_set_ruler_x (box, g_value_get_object (value)); - break; - case RULER_Y: - gtk_databox_set_ruler_y (box, g_value_get_object (value)); - break; - case SCALE_TYPE_X: - gtk_databox_set_scale_type_x (box, g_value_get_enum (value)); - break; - case SCALE_TYPE_Y: - gtk_databox_set_scale_type_y (box, g_value_get_enum (value)); - break; - default: - /* We don't have any other property... */ - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } + guint property_id, + const GValue * value, GParamSpec * pspec) { + GtkDatabox *box = GTK_DATABOX (object); + switch (property_id) { + case ENABLE_SELECTION: + gtk_databox_set_enable_selection (box, g_value_get_boolean (value)); + break; + case ENABLE_ZOOM: + gtk_databox_set_enable_zoom (box, g_value_get_boolean (value)); + break; + case ADJUSTMENT_X: + gtk_databox_set_adjustment_x (box, g_value_get_object (value)); + break; + case ADJUSTMENT_Y: + gtk_databox_set_adjustment_y (box, g_value_get_object (value)); + break; + case RULER_X: + gtk_databox_set_ruler_x (box, g_value_get_object (value)); + break; + case RULER_Y: + gtk_databox_set_ruler_y (box, g_value_get_object (value)); + break; + case SCALE_TYPE_X: + gtk_databox_set_scale_type_x (box, g_value_get_enum (value)); + break; + case SCALE_TYPE_Y: + gtk_databox_set_scale_type_y (box, g_value_get_enum (value)); + break; + case BOX_SHADOW: + gtk_databox_set_box_shadow (box, (GtkShadowType) g_value_get_uint (value)); + break; + default: + /* We don't have any other property... */ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } static void gtk_databox_get_property (GObject * object, - guint property_id, - GValue * value, GParamSpec * pspec) -{ - GtkDatabox *box = GTK_DATABOX (object); - - switch (property_id) - { - case ENABLE_SELECTION: - g_value_set_boolean (value, gtk_databox_get_enable_selection (box)); - break; - case ENABLE_ZOOM: - g_value_set_boolean (value, gtk_databox_get_enable_zoom (box)); - break; - case ADJUSTMENT_X: - g_value_set_object (value, G_OBJECT (gtk_databox_get_adjustment_x (box))); - break; - case ADJUSTMENT_Y: - g_value_set_object (value, G_OBJECT (gtk_databox_get_adjustment_y (box))); - break; - case RULER_X: - g_value_set_object (value, G_OBJECT (gtk_databox_get_ruler_x (box))); - break; - case RULER_Y: - g_value_set_object (value, G_OBJECT (gtk_databox_get_ruler_y (box))); - break; - case SCALE_TYPE_X: - g_value_set_enum (value, gtk_databox_get_scale_type_x (box)); - break; - case SCALE_TYPE_Y: - g_value_set_enum (value, gtk_databox_get_scale_type_y (box)); - break; - default: - /* We don't have any other property... */ - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } + guint property_id, + GValue * value, GParamSpec * pspec) { + GtkDatabox *box = GTK_DATABOX (object); + + switch (property_id) { + case ENABLE_SELECTION: + g_value_set_boolean (value, gtk_databox_get_enable_selection (box)); + break; + case ENABLE_ZOOM: + g_value_set_boolean (value, gtk_databox_get_enable_zoom (box)); + break; + case ADJUSTMENT_X: + g_value_set_object (value, G_OBJECT (gtk_databox_get_adjustment_x (box))); + break; + case ADJUSTMENT_Y: + g_value_set_object (value, G_OBJECT (gtk_databox_get_adjustment_y (box))); + break; + case RULER_X: + g_value_set_object (value, G_OBJECT (gtk_databox_get_ruler_x (box))); + break; + case RULER_Y: + g_value_set_object (value, G_OBJECT (gtk_databox_get_ruler_y (box))); + break; + case SCALE_TYPE_X: + g_value_set_enum (value, gtk_databox_get_scale_type_x (box)); + break; + case SCALE_TYPE_Y: + g_value_set_enum (value, gtk_databox_get_scale_type_y (box)); + break; + case BOX_SHADOW: + g_value_set_uint (value, box->priv->box_shadow); + break; + default: + /* We don't have any other property... */ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } static void -gtk_databox_realize (GtkWidget * widget) -{ - GtkDatabox *box; - GdkWindowAttr attributes; - gint attributes_mask; - - box = GTK_DATABOX (widget); - GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = gtk_widget_get_events (widget); - attributes.event_mask |= (GDK_EXPOSURE_MASK | - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK); - - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - - widget->window = - gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, - attributes_mask); - gdk_window_set_user_data (widget->window, box); +gtk_databox_realize (GtkWidget * widget) { + GtkDatabox *box; + GdkWindowAttr attributes; + gint attributes_mask; + + + box = GTK_DATABOX (widget); + gtk_widget_set_realized(widget, GTK_REALIZED); + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = gtk_widget_get_events (widget); + attributes.event_mask |= (GDK_EXPOSURE_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + widget->window = + gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, + attributes_mask); + gdk_window_set_user_data (widget->window, box); - widget->style = gtk_style_attach (widget->style, widget->window); - gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); + widget->style = gtk_style_attach (widget->style, widget->window); + gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); - gtk_databox_create_backing_pixmap (box); + gtk_databox_create_backing_pixmap (box); } static void -gtk_databox_unrealize (GtkWidget * widget) -{ - GtkDatabox *box = GTK_DATABOX (widget); +gtk_databox_unrealize (GtkWidget * widget) { + GtkDatabox *box = GTK_DATABOX (widget); + gtk_widget_set_realized(widget, FALSE); + + if (box->priv->backing_pixmap) + g_object_unref (box->priv->backing_pixmap); + box->priv->backing_pixmap=NULL; + if (box->priv->select_gc) + gtk_gc_release (box->priv->select_gc); + if (box->priv->adj_x) + g_object_unref (box->priv->adj_x); + if (box->priv->adj_y) + g_object_unref (box->priv->adj_y); - if (box->priv->backing_pixmap) - g_object_unref (box->priv->backing_pixmap); - if (box->priv->select_gc) - gtk_gc_release (box->priv->select_gc); - if (box->priv->adj_x) - g_object_unref (box->priv->adj_x); - if (box->priv->adj_y) - g_object_unref (box->priv->adj_y); - if (box->priv->graphs) - g_list_free (box->priv->graphs); + g_list_free (box->priv->graphs); + box->priv->graphs=NULL; - g_free (box->priv); + if (GTK_WIDGET_CLASS (gtk_databox_parent_class)->unrealize) + (*GTK_WIDGET_CLASS (gtk_databox_parent_class)->unrealize) (widget); - if (GTK_WIDGET_CLASS (gtk_databox_parent_class)->unrealize) - (*GTK_WIDGET_CLASS (gtk_databox_parent_class)->unrealize) (widget); } -/** +/** * gtk_databox_set_enable_selection * @box: A #GtkDatabox widget * @enable: Whether selection via mouse is enabled or not. @@ -648,20 +657,18 @@ * */ void -gtk_databox_set_enable_selection (GtkDatabox * box, gboolean enable) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); +gtk_databox_set_enable_selection (GtkDatabox * box, gboolean enable) { + g_return_if_fail (GTK_IS_DATABOX (box)); - box->priv->enable_selection = enable; - if (box->priv->selection_active) - { - gtk_databox_selection_cancel (box); - } + box->priv->enable_selection = enable; + if (box->priv->selection_active) { + gtk_databox_selection_cancel (box); + } - g_object_notify (G_OBJECT (box), "enable-selection"); + g_object_notify (G_OBJECT (box), "enable-selection"); } -/** +/** * gtk_databox_set_enable_zoom * @box: A #GtkDatabox widget * @enable: Whether zoom via mouse is enabled or not. @@ -670,108 +677,103 @@ * */ void -gtk_databox_set_enable_zoom (GtkDatabox * box, gboolean enable) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); +gtk_databox_set_enable_zoom (GtkDatabox * box, gboolean enable) { + g_return_if_fail (GTK_IS_DATABOX (box)); - box->priv->enable_zoom = enable; + box->priv->enable_zoom = enable; - g_object_notify (G_OBJECT (box), "enable-zoom"); + g_object_notify (G_OBJECT (box), "enable-zoom"); } -/** +/** * gtk_databox_set_adjustment_x * @box: A #GtkDatabox widget * @adj: A #GtkAdjustment object * - * Setter function for the #GtkDatabox:adjustment-x property. Normally, it should not be + * Setter function for the #GtkDatabox:adjustment-x property. Normally, it should not be * required to use this function, see property documentation. * */ void -gtk_databox_set_adjustment_x (GtkDatabox * box, GtkAdjustment * adj) -{ - if (!adj) - adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 0, 0, 0, 0)); - - g_return_if_fail (GTK_IS_DATABOX (box)); - g_return_if_fail (GTK_IS_ADJUSTMENT (adj)); - - if (box->priv->adj_x) - { - /* @@@ Do we need to disconnect from the signals here? */ - g_object_unref (box->priv->adj_x); - if (g_object_is_floating(G_OBJECT(box->priv->adj_x))) - g_object_ref_sink (box->priv->adj_x); - } - - box->priv->adj_x = adj; - g_object_ref (box->priv->adj_x); - - /* We always scroll from 0 to 1.0 */ - box->priv->adj_x->lower = 0; - box->priv->adj_x->value = gtk_databox_get_offset_x (box); - box->priv->adj_x->upper = 1.0; - box->priv->adj_x->page_size = gtk_databox_get_page_size_x (box); - box->priv->adj_x->step_increment = box->priv->adj_x->page_size / 20; - box->priv->adj_x->page_increment = box->priv->adj_x->page_size * 0.9; - - gtk_adjustment_changed (box->priv->adj_x); - - g_signal_connect_swapped (G_OBJECT (box->priv->adj_x), "value_changed", - G_CALLBACK - (gtk_databox_adjustment_value_changed), box); +gtk_databox_set_adjustment_x (GtkDatabox * box, GtkAdjustment * adj) { + if (!adj) + adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 0, 0, 0, 0)); + + g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (GTK_IS_ADJUSTMENT (adj)); + + if (box->priv->adj_x) { + /* @@@ Do we need to disconnect from the signals here? */ + g_object_unref (box->priv->adj_x); + if (g_object_is_floating(G_OBJECT(box->priv->adj_x))) + g_object_ref_sink (box->priv->adj_x); + } + + box->priv->adj_x = adj; + g_object_ref (box->priv->adj_x); + + /* We always scroll from 0 to 1.0 */ + box->priv->adj_x->lower = 0; + box->priv->adj_x->value = gtk_databox_get_offset_x (box); + box->priv->adj_x->upper = 1.0; + box->priv->adj_x->page_size = gtk_databox_get_page_size_x (box); + box->priv->adj_x->step_increment = box->priv->adj_x->page_size / 20; + box->priv->adj_x->page_increment = box->priv->adj_x->page_size * 0.9; + + gtk_adjustment_changed (box->priv->adj_x); + + g_signal_connect_swapped (G_OBJECT (box->priv->adj_x), "value_changed", + G_CALLBACK + (gtk_databox_adjustment_value_changed), box); - g_object_notify (G_OBJECT (box), "adjustment-x"); + g_object_notify (G_OBJECT (box), "adjustment-x"); } -/** +/** * gtk_databox_set_adjustment_y * @box: A #GtkDatabox widget * @adj: A #GtkAdjustment object * - * Setter function for the #GtkDatabox:adjustment-y property. Normally, it should not be + * Setter function for the #GtkDatabox:adjustment-y property. Normally, it should not be * required to use this function, see property documentation. * */ void -gtk_databox_set_adjustment_y (GtkDatabox * box, GtkAdjustment * adj) -{ - if (!adj) - adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 0, 0, 0, 0)); - - g_return_if_fail (GTK_IS_DATABOX (box)); - g_return_if_fail (GTK_IS_ADJUSTMENT (adj)); - - if (box->priv->adj_y) - { - /* @@@ Do we need to disconnect from the signals here? */ - g_object_unref (box->priv->adj_y); - if (g_object_is_floating(G_OBJECT(box->priv->adj_y))) - g_object_ref_sink (box->priv->adj_y); - } - - box->priv->adj_y = adj; - g_object_ref (box->priv->adj_y); - - /* We always scroll from 0 to 1.0 */ - box->priv->adj_y->lower = 0; - box->priv->adj_y->value = gtk_databox_get_offset_y (box); - box->priv->adj_y->upper = 1.0; - box->priv->adj_y->page_size = gtk_databox_get_page_size_y (box); - box->priv->adj_y->step_increment = box->priv->adj_y->page_size / 20; - box->priv->adj_y->page_increment = box->priv->adj_y->page_size * 0.9; - - gtk_adjustment_changed (box->priv->adj_y); - - g_signal_connect_swapped (G_OBJECT (box->priv->adj_y), "value_changed", - G_CALLBACK - (gtk_databox_adjustment_value_changed), box); +gtk_databox_set_adjustment_y (GtkDatabox * box, GtkAdjustment * adj) { + if (!adj) + adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 0, 0, 0, 0)); - g_object_notify (G_OBJECT (box), "adjustment-y"); + g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (GTK_IS_ADJUSTMENT (adj)); + + if (box->priv->adj_y) { + /* @@@ Do we need to disconnect from the signals here? */ + g_object_unref (box->priv->adj_y); + if (g_object_is_floating(G_OBJECT(box->priv->adj_y))) + g_object_ref_sink (box->priv->adj_y); + } + + box->priv->adj_y = adj; + g_object_ref (box->priv->adj_y); + + /* We always scroll from 0 to 1.0 */ + box->priv->adj_y->lower = 0; + box->priv->adj_y->value = gtk_databox_get_offset_y (box); + box->priv->adj_y->upper = 1.0; + box->priv->adj_y->page_size = gtk_databox_get_page_size_y (box); + box->priv->adj_y->step_increment = box->priv->adj_y->page_size / 20; + box->priv->adj_y->page_increment = box->priv->adj_y->page_size * 0.9; + + gtk_adjustment_changed (box->priv->adj_y); + + g_signal_connect_swapped (G_OBJECT (box->priv->adj_y), "value_changed", + G_CALLBACK + (gtk_databox_adjustment_value_changed), box); + + g_object_notify (G_OBJECT (box), "adjustment-y"); } -/** +/** * gtk_databox_set_ruler_x * @box: A #GtkDatabox widget * @ruler: A #GtkDataboxRuler object @@ -780,37 +782,33 @@ * */ void -gtk_databox_set_ruler_x (GtkDatabox * box, GtkDataboxRuler * ruler) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); - g_return_if_fail (ruler == NULL || GTK_DATABOX_IS_RULER (ruler)); - g_return_if_fail (ruler == NULL || gtk_databox_ruler_get_orientation(ruler) == GTK_ORIENTATION_HORIZONTAL); - - if (box->priv->ruler_x) - { - /* @@@ Do we need to disconnect the signals here? */ - /* @@@ Do we need to call object_ref and object_unref here and for adjustments? */ - } - - box->priv->ruler_x = ruler; - - if (GTK_DATABOX_IS_RULER (ruler)) - { - gtk_databox_ruler_set_scale_type (ruler, - box->priv->scale_type_x); - - gtk_databox_ruler_update (box); - g_signal_connect_swapped (box, "motion_notify_event", - G_CALLBACK (GTK_WIDGET_GET_CLASS - (box->priv->ruler_x)-> - motion_notify_event), - G_OBJECT (box->priv->ruler_x)); - } +gtk_databox_set_ruler_x (GtkDatabox * box, GtkDataboxRuler * ruler) { + g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (ruler == NULL || GTK_DATABOX_IS_RULER (ruler)); + g_return_if_fail (ruler == NULL || gtk_databox_ruler_get_orientation(ruler) == GTK_ORIENTATION_HORIZONTAL); - g_object_notify (G_OBJECT (box), "ruler-x"); + if (box->priv->ruler_x) { + /* @@@ Do we need to disconnect the signals here? */ + /* @@@ Do we need to call object_ref and object_unref here and for adjustments? */ + } + + box->priv->ruler_x = ruler; + + if (GTK_DATABOX_IS_RULER (ruler)) { + gtk_databox_ruler_set_scale_type (ruler, box->priv->scale_type_x); + + gtk_databox_ruler_update (box); + g_signal_connect_swapped (box, "motion_notify_event", + G_CALLBACK (GTK_WIDGET_GET_CLASS + (box->priv->ruler_x)-> + motion_notify_event), + G_OBJECT (box->priv->ruler_x)); + } + + g_object_notify (G_OBJECT (box), "ruler-x"); } -/** +/** * gtk_databox_set_ruler_y * @box: A #GtkDatabox widget * @ruler: An #GtkDataboxRuler object @@ -819,37 +817,34 @@ * */ void -gtk_databox_set_ruler_y (GtkDatabox * box, GtkDataboxRuler * ruler) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); - g_return_if_fail (ruler == NULL || GTK_DATABOX_IS_RULER (ruler)); - g_return_if_fail (ruler == NULL || gtk_databox_ruler_get_orientation(ruler) == GTK_ORIENTATION_VERTICAL); - - if (box->priv->ruler_y) - { - /* @@@ Do we need to disconnect the signals here? */ - /* @@@ Do we need to call object_ref and object_unref here and for adjustments? */ - } - - box->priv->ruler_y = ruler; - - if (GTK_DATABOX_IS_RULER (ruler)) - { - gtk_databox_ruler_set_scale_type (ruler, - box->priv->scale_type_y); - - gtk_databox_ruler_update (box); - g_signal_connect_swapped (box, "motion_notify_event", - G_CALLBACK (GTK_WIDGET_GET_CLASS - (box->priv->ruler_y)-> - motion_notify_event), - G_OBJECT (box->priv->ruler_y)); - } +gtk_databox_set_ruler_y (GtkDatabox * box, GtkDataboxRuler * ruler) { + g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (ruler == NULL || GTK_DATABOX_IS_RULER (ruler)); + g_return_if_fail (ruler == NULL || gtk_databox_ruler_get_orientation(ruler) == GTK_ORIENTATION_VERTICAL); + + if (box->priv->ruler_y) { + /* @@@ Do we need to disconnect the signals here? */ + /* @@@ Do we need to call object_ref and object_unref here and for adjustments? */ + } + + box->priv->ruler_y = ruler; + + if (GTK_DATABOX_IS_RULER (ruler)) { + gtk_databox_ruler_set_scale_type (ruler, + box->priv->scale_type_y); + + gtk_databox_ruler_update (box); + g_signal_connect_swapped (box, "motion_notify_event", + G_CALLBACK (GTK_WIDGET_GET_CLASS + (box->priv->ruler_y)-> + motion_notify_event), + G_OBJECT (box->priv->ruler_y)); + } - g_object_notify (G_OBJECT (box), "ruler-y"); + g_object_notify (G_OBJECT (box), "ruler-y"); } -/** +/** * gtk_databox_set_scale_type_x * @box: A #GtkDatabox widget * @scale_type: An #GtkDataboxScaleType (linear or logarithmic) @@ -859,17 +854,16 @@ */ void gtk_databox_set_scale_type_x (GtkDatabox * box, - GtkDataboxScaleType scale_type) -{ - box->priv->scale_type_x = scale_type; + GtkDataboxScaleType scale_type) { + box->priv->scale_type_x = scale_type; - if (box->priv->ruler_x) - gtk_databox_ruler_set_scale_type (box->priv->ruler_x, scale_type); + if (box->priv->ruler_x) + gtk_databox_ruler_set_scale_type (box->priv->ruler_x, scale_type); - g_object_notify (G_OBJECT (box), "scale-type-x"); + g_object_notify (G_OBJECT (box), "scale-type-x"); } -/** +/** * gtk_databox_set_scale_type_y * @box: A #GtkDatabox widget * @scale_type: An #GtkDataboxScaleType (linear or logarithmic) @@ -879,17 +873,37 @@ */ void gtk_databox_set_scale_type_y (GtkDatabox * box, - GtkDataboxScaleType scale_type) -{ - box->priv->scale_type_y = scale_type; - - if (box->priv->ruler_y) - gtk_databox_ruler_set_scale_type (box->priv->ruler_y, scale_type); + GtkDataboxScaleType scale_type) { + box->priv->scale_type_y = scale_type; + + if (box->priv->ruler_y) + gtk_databox_ruler_set_scale_type (box->priv->ruler_y, scale_type); + + g_object_notify (G_OBJECT (box), "scale-type-y"); +} + +/** + * gtk_databox_set_box_shadow: + * @box: a #GtkDatabox widget. + * @which_shadow: How to render the box shadow on the GtkDatabox edges. + * + * Sets the shadow type when using gtk_paint_box. This will draw the desired edge shadow. + **/ +void +gtk_databox_set_box_shadow(GtkDatabox * box, GtkShadowType which_shadow) { + g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (which_shadow>=0); + g_return_if_fail (which_shadow<=GTK_SHADOW_ETCHED_OUT); - g_object_notify (G_OBJECT (box), "scale-type-y"); + if (box->priv->box_shadow!=which_shadow) { + box->priv->box_shadow=which_shadow; + if (gtk_widget_is_drawable (GTK_WIDGET (box))) + gtk_widget_queue_draw (GTK_WIDGET (box)); + } } -/** + +/** * gtk_databox_get_enable_selection * @box: A #GtkDatabox widget. * @@ -899,14 +913,13 @@ * */ gboolean -gtk_databox_get_enable_selection (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), FALSE); +gtk_databox_get_enable_selection (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), FALSE); - return box->priv->enable_selection; + return box->priv->enable_selection; } -/** +/** * gtk_databox_get_enable_zoom * @box: A #GtkDatabox widget. * @@ -916,14 +929,13 @@ * */ gboolean -gtk_databox_get_enable_zoom (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), FALSE); +gtk_databox_get_enable_zoom (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), FALSE); - return box->priv->enable_zoom; + return box->priv->enable_zoom; } -/** +/** * gtk_databox_get_adjustment_x * @box: A #GtkDatabox widget. * @@ -933,14 +945,13 @@ * */ GtkAdjustment * -gtk_databox_get_adjustment_x (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); +gtk_databox_get_adjustment_x (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); - return box->priv->adj_x; + return box->priv->adj_x; } -/** +/** * gtk_databox_get_adjustment_y * @box: A #GtkDatabox widget. * @@ -950,14 +961,13 @@ * */ GtkAdjustment * -gtk_databox_get_adjustment_y (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); +gtk_databox_get_adjustment_y (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); - return box->priv->adj_y; + return box->priv->adj_y; } -/** +/** * gtk_databox_get_ruler_x * @box: A #GtkDatabox widget. * @@ -967,14 +977,13 @@ * */ GtkDataboxRuler * -gtk_databox_get_ruler_x (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); +gtk_databox_get_ruler_x (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); - return box->priv->ruler_x; + return box->priv->ruler_x; } -/** +/** * gtk_databox_get_ruler_y * @box: A #GtkDatabox widget. * @@ -984,14 +993,13 @@ * */ GtkDataboxRuler * -gtk_databox_get_ruler_y (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); +gtk_databox_get_ruler_y (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); - return box->priv->ruler_y; + return box->priv->ruler_y; } -/** +/** * gtk_databox_get_scale_type_x * @box: A #GtkDatabox widget. * @@ -1001,12 +1009,11 @@ * */ GtkDataboxScaleType -gtk_databox_get_scale_type_x (GtkDatabox * box) -{ - return box->priv->scale_type_x; +gtk_databox_get_scale_type_x (GtkDatabox * box) { + return box->priv->scale_type_x; } -/** +/** * gtk_databox_get_scale_type_y * @box: A #GtkDatabox widget. * @@ -1016,73 +1023,85 @@ * */ GtkDataboxScaleType -gtk_databox_get_scale_type_y (GtkDatabox * box) -{ - return box->priv->scale_type_y; +gtk_databox_get_scale_type_y (GtkDatabox * box) { + return box->priv->scale_type_y; +} + +/** + * gtk_databox_get_box_shadow: + * @box: a #GtkDatabox widget + * + * Gets the type of shadow being rendered to the @box (GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT). + * + * Return value: The currently used shadow type of the @box, -1 on failure. + **/ +GtkShadowType +gtk_databox_get_box_shadow(GtkDatabox * box) { + + g_return_val_if_fail (GTK_IS_DATABOX (box), -1); + + return box->priv->box_shadow; } static void -gtk_databox_calculate_translation_factors (GtkDatabox * box) -{ - /* @@@ Check for all external functions, if type checks are implemented! */ - GtkWidget *widget = GTK_WIDGET(box); - - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - box->priv->translation_factor_x = - widget->allocation.width / (box->priv->visible_right - - box->priv->visible_left); - else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) - box->priv->translation_factor_x = - widget->allocation.width / log2 (box->priv->visible_right / - box->priv->visible_left); - else - box->priv->translation_factor_x = - widget->allocation.width / log10 (box->priv->visible_right / - box->priv->visible_left); - - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - box->priv->translation_factor_y = - widget->allocation.height / (box->priv->visible_bottom - - box->priv->visible_top); - else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) - box->priv->translation_factor_y = - widget->allocation.height / log2 (box->priv->visible_bottom / - box->priv->visible_top); - else - box->priv->translation_factor_y = - widget->allocation.height / log10 (box->priv->visible_bottom / - box->priv->visible_top); +gtk_databox_calculate_translation_factors (GtkDatabox * box) { + /* @@@ Check for all external functions, if type checks are implemented! */ + GtkWidget *widget = GTK_WIDGET(box); + + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) + box->priv->translation_factor_x = + widget->allocation.width / (box->priv->visible_right - + box->priv->visible_left); + else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) + box->priv->translation_factor_x = + widget->allocation.width / log2 (box->priv->visible_right / + box->priv->visible_left); + else + box->priv->translation_factor_x = + widget->allocation.width / log10 (box->priv->visible_right / + box->priv->visible_left); + + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) + box->priv->translation_factor_y = + widget->allocation.height / (box->priv->visible_bottom - + box->priv->visible_top); + else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) + box->priv->translation_factor_y = + widget->allocation.height / log2 (box->priv->visible_bottom / + box->priv->visible_top); + else + box->priv->translation_factor_y = + widget->allocation.height / log10 (box->priv->visible_bottom / + box->priv->visible_top); } static void -gtk_databox_create_backing_pixmap(GtkDatabox * box) -{ - GtkWidget *widget; - gint width; - gint height; - - widget = GTK_WIDGET (box); - - if (box->priv->backing_pixmap) - { - gdk_drawable_get_size (box->priv->backing_pixmap, &width, &height); - if ((width == widget->allocation.width) && - (height == widget->allocation.height)) - return; - - g_object_unref (box->priv->backing_pixmap); - } - - box->priv->backing_pixmap = gdk_pixmap_new (widget->window, - widget->allocation.width, - widget->allocation.height, -1); +gtk_databox_create_backing_pixmap(GtkDatabox * box) { + GtkWidget *widget; + gint width; + gint height; + + widget = GTK_WIDGET (box); + if (box->priv->backing_pixmap) { + gdk_drawable_get_size (box->priv->backing_pixmap, &width, &height); + if ((width == widget->allocation.width) && + (height == widget->allocation.height)) + return; + + g_object_unref (box->priv->backing_pixmap); + } + + width = widget->allocation.width; + height = widget->allocation.height; + box->priv->backing_pixmap = gdk_pixmap_new (widget->window, + width, height, -1); } -/** +/** * gtk_databox_get_backing_pixmap: * @box: A #GtkDatabox widget * - * This function returns the pixmap which is used by @box and its #GtkDataboxGraph objects + * This function returns the pixmap which is used by @box and its #GtkDataboxGraph objects * for drawing operations before copying the result to the screen. * * The function is typically called by the #GtkDataboxGraph objects. @@ -1090,407 +1109,450 @@ * Return value: Backing pixmap */ GdkPixmap * -gtk_databox_get_backing_pixmap(GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); +gtk_databox_get_backing_pixmap(GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), NULL); - return box->priv->backing_pixmap; + return box->priv->backing_pixmap; } static void -gtk_databox_size_allocate (GtkWidget * widget, GtkAllocation * allocation) -{ - GtkDatabox *box = GTK_DATABOX (widget); - - widget->allocation = *allocation; - - if (GTK_WIDGET_REALIZED (widget)) - { - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, - allocation->width, allocation->height); - - gtk_databox_create_backing_pixmap (box); - } - - if (box->priv->selection_active) - { - gtk_databox_selection_cancel (box); - } +gtk_databox_size_allocate (GtkWidget * widget, GtkAllocation * allocation) { + GtkDatabox *box = GTK_DATABOX (widget); + + widget->allocation = *allocation; + + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, allocation->height); - gtk_databox_calculate_translation_factors (box); + gtk_databox_create_backing_pixmap (box); + + if (box->priv->selection_active) { + gtk_databox_selection_cancel (box); + } + + gtk_databox_calculate_translation_factors (box); } static gint -gtk_databox_expose (GtkWidget * widget, GdkEventExpose * event) -{ - GtkDatabox *box = GTK_DATABOX (widget); - GList *list; - - gdk_draw_rectangle (box->priv->backing_pixmap, - widget->style->bg_gc[0], - TRUE, 0, 0, - widget->allocation.width, - widget->allocation.height); - - list = g_list_last (box->priv->graphs); - - while (list) - { - if (list->data) - { - gtk_databox_graph_draw (GTK_DATABOX_GRAPH (list->data), box); - } - else - { - /* Do nothing if data == NULL */ - } - list = g_list_previous (list); - } - - if (box->priv->selection_active) - { - gtk_databox_draw_selection (box, NULL); - } - - gdk_draw_drawable (widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE (widget)], - box->priv->backing_pixmap, - event->area.x, event->area.y, - event->area.x, event->area.y, - event->area.width, - event->area.height); - - return FALSE; +gtk_databox_expose (GtkWidget * widget, GdkEventExpose * event) { + GtkDatabox *box = GTK_DATABOX (widget); + GList *list; + gint width, height; + + gdk_draw_rectangle (box->priv->backing_pixmap, + widget->style->bg_gc[0], + TRUE, 0, 0, + widget->allocation.width, + widget->allocation.height); + + width = widget->allocation.width; + height = widget->allocation.height; + gtk_paint_box (widget->style, box->priv->backing_pixmap, + GTK_STATE_NORMAL, box->priv->box_shadow, + NULL, widget, "box", 0, 0, width, height); + + + list = g_list_last (box->priv->graphs); + while (list) { + if (list->data) { + gtk_databox_graph_draw (GTK_DATABOX_GRAPH (list->data), box); + } else { + /* Do nothing if data == NULL */ + } + list = g_list_previous (list); + } + + if (box->priv->selection_active) { + gtk_databox_draw_selection (box, NULL); + } + + gdk_draw_drawable (widget->window, + widget->style->fg_gc[gtk_widget_get_state (widget)], + box->priv->backing_pixmap, + event->area.x, event->area.y, + event->area.x, event->area.y, + event->area.width, + event->area.height); + return FALSE; } static void -gtk_databox_calculate_selection_values (GtkDatabox * box) -{ - box->priv->selectionValues.x1 = - gtk_databox_pixel_to_value_x (box, box->priv->marked.x); - box->priv->selectionValues.x2 = - gtk_databox_pixel_to_value_x (box, box->priv->select.x); - box->priv->selectionValues.y1 = - gtk_databox_pixel_to_value_y (box, box->priv->marked.y); - box->priv->selectionValues.y2 = - gtk_databox_pixel_to_value_y (box, box->priv->select.y); +gtk_databox_calculate_selection_values (GtkDatabox * box) { + box->priv->selectionValues.x1 = + gtk_databox_pixel_to_value_x (box, box->priv->marked.x); + box->priv->selectionValues.x2 = + gtk_databox_pixel_to_value_x (box, box->priv->select.x); + box->priv->selectionValues.y1 = + gtk_databox_pixel_to_value_y (box, box->priv->marked.y); + box->priv->selectionValues.y2 = + gtk_databox_pixel_to_value_y (box, box->priv->select.y); } static gint -gtk_databox_button_press (GtkWidget * widget, GdkEventButton * event) -{ - GtkDatabox *box = GTK_DATABOX (widget); - - if (event->type != GDK_BUTTON_PRESS) - return FALSE; - - box->priv->selection_finalized = FALSE; - - if ((event->button == 1 || event->button == 2)) - { - if (box->priv->selection_active) - { - if (event->x > MIN (box->priv->marked.x, box->priv->select.x) - && event->x < MAX (box->priv->marked.x, box->priv->select.x) - && event->y > MIN (box->priv->marked.y, box->priv->select.y) - && event->y < MAX (box->priv->marked.y, box->priv->select.y)) - { - gtk_databox_zoom_to_selection (box); - } - else - { - gtk_databox_selection_cancel (box); - } - box->priv->marked.x = box->priv->select.x = event->x; - box->priv->marked.y = box->priv->select.y = event->y; - gtk_databox_calculate_selection_values (box); - } - } - - if (event->button == 3) - { - if (event->state & GDK_SHIFT_MASK) - { - gtk_databox_zoom_home (box); - } - else - { - gtk_databox_zoom_out (box); - } - } +gtk_databox_button_press (GtkWidget * widget, GdkEventButton * event) { + GtkDatabox *box = GTK_DATABOX (widget); - return FALSE; + if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS) + return FALSE; + + box->priv->selection_finalized = FALSE; + if ((event->button == 1 || event->button == 2) & !(event->type==GDK_2BUTTON_PRESS)) { + if (box->priv->selection_active) { + if (event->x > MIN (box->priv->marked.x, box->priv->select.x) + && event->x < MAX (box->priv->marked.x, box->priv->select.x) + && event->y > MIN (box->priv->marked.y, box->priv->select.y) + && event->y < MAX (box->priv->marked.y, box->priv->select.y)) { + gtk_databox_zoom_to_selection (box); + } else { + gtk_databox_selection_cancel (box); + } + box->priv->marked.x = box->priv->select.x = event->x; + box->priv->marked.y = box->priv->select.y = event->y; + gtk_databox_calculate_selection_values (box); + } + } + + if ((event->button == 3) || (event->button == 1 && event->type==GDK_2BUTTON_PRESS)) { + if (event->state & GDK_SHIFT_MASK) { + gtk_databox_zoom_home (box); + } else { + gtk_databox_zoom_out (box); + } + } + + return FALSE; } static gint -gtk_databox_button_release (GtkWidget * widget, GdkEventButton * event) -{ - GtkDatabox *box = GTK_DATABOX (widget); - - if (event->type != GDK_BUTTON_RELEASE) - return FALSE; - - if (box->priv->selection_active) - { - box->priv->selection_finalized = TRUE; - - g_signal_emit (G_OBJECT (box), - gtk_databox_signals[SELECTION_FINALIZED_SIGNAL], - 0, &box->priv->selectionValues); - } +gtk_databox_button_release (GtkWidget * widget, GdkEventButton * event) { + GtkDatabox *box = GTK_DATABOX (widget); + + if (event->type != GDK_BUTTON_RELEASE) + return FALSE; - return FALSE; + if (box->priv->selection_active) { + box->priv->selection_finalized = TRUE; + + g_signal_emit (G_OBJECT (box), + gtk_databox_signals[SELECTION_FINALIZED_SIGNAL], + 0, &box->priv->selectionValues); + } + + return FALSE; +} + +static gint +gtk_databox_scroll_event (GtkWidget *widget, GdkEventScroll *event) { + GtkDatabox *box = GTK_DATABOX (widget); + + if (event->state & GDK_CONTROL_MASK && box->priv->enable_zoom) { + if (event->direction == GDK_SCROLL_DOWN) { + gtk_databox_zoom_out(box); + } else if (event->direction == GDK_SCROLL_UP && + box->priv->adj_x->page_size / 2 >= box->priv->zoom_limit && + box->priv->adj_y->page_size / 2 >= box->priv->zoom_limit) { + gdouble x_val, y_val; + gdouble x_proportion, y_proportion; + + x_val = gtk_databox_pixel_to_value_x(box, event->x); + y_val = gtk_databox_pixel_to_value_y(box, event->y); + + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) { + x_proportion = (x_val - box->priv->total_left) / + (box->priv->total_right - box->priv->total_left); + } else { + x_proportion = log(x_val/box->priv->total_left) / + log(box->priv->total_right / box->priv->total_left); + } + + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) { + y_proportion = (y_val - box->priv->total_top) / + (box->priv->total_bottom - box->priv->total_top); + } else { + y_proportion = log(y_val/box->priv->total_top) / + log(box->priv->total_bottom / box->priv->total_top); + } + + box->priv->adj_x->page_size = box->priv->adj_x->page_size/2; + box->priv->adj_x->value = (x_proportion + + box->priv->adj_x->value) / 2; + + box->priv->adj_y->page_size = box->priv->adj_y->page_size/2; + box->priv->adj_y->value = (y_proportion + + box->priv->adj_y->value) / 2; + + gtk_databox_calculate_visible_limits(box); + gtk_databox_zoomed (box); + } + } else { + GtkAdjustment *adj; + gdouble delta, new_value; + + if ((event->direction == GDK_SCROLL_UP || + event->direction == GDK_SCROLL_DOWN) && + !(event->state & GDK_MOD1_MASK)) { + adj = box->priv->adj_y; + } else { + adj = box->priv->adj_x; + } + + switch (event->direction) { + case GDK_SCROLL_UP: + case GDK_SCROLL_LEFT: + delta = - adj->step_increment; + break; + case GDK_SCROLL_DOWN: + case GDK_SCROLL_RIGHT: + delta = adj->step_increment; + break; + } + + new_value = CLAMP (adj->value + delta, adj->lower, + adj->upper - adj->page_size); + gtk_adjustment_set_value(adj, new_value); + } + + return FALSE; } static void -gtk_databox_selection_cancel (GtkDatabox * box) -{ - GdkRectangle rect; - - /* There is no active selection after cancellation */ - box->priv->selection_active = FALSE; - - /* Only active selections can be stopped */ - box->priv->selection_finalized = FALSE; - - /* Remove selection box */ - rect.x = MIN (box->priv->marked.x, box->priv->select.x); - rect.y = MIN (box->priv->marked.y, box->priv->select.y); - rect.width = ABS (box->priv->marked.x - box->priv->select.x) + 1; - rect.height = ABS (box->priv->marked.y - box->priv->select.y) + 1; - - gtk_databox_draw_selection (box, &rect); - - /* Let everyone know that the selection has been canceled */ - g_signal_emit (G_OBJECT (box), - gtk_databox_signals[SELECTION_CANCELED_SIGNAL], 0); +gtk_databox_selection_cancel (GtkDatabox * box) { + GdkRectangle rect; + + /* There is no active selection after cancellation */ + box->priv->selection_active = FALSE; + + /* Only active selections can be stopped */ + box->priv->selection_finalized = FALSE; + + /* Remove selection box */ + rect.x = MIN (box->priv->marked.x, box->priv->select.x); + rect.y = MIN (box->priv->marked.y, box->priv->select.y); + rect.width = ABS (box->priv->marked.x - box->priv->select.x) + 1; + rect.height = ABS (box->priv->marked.y - box->priv->select.y) + 1; + + gtk_databox_draw_selection (box, &rect); + + /* Let everyone know that the selection has been canceled */ + g_signal_emit (G_OBJECT (box), + gtk_databox_signals[SELECTION_CANCELED_SIGNAL], 0); } static void -gtk_databox_zoomed (GtkDatabox * box) -{ - box->priv->selection_active = FALSE; - box->priv->selection_finalized = FALSE; +gtk_databox_zoomed (GtkDatabox * box) { - gtk_adjustment_changed (box->priv->adj_x); - gtk_adjustment_changed (box->priv->adj_y); + g_return_if_fail(GTK_IS_DATABOX(box)); + g_return_if_fail(GTK_IS_ADJUSTMENT(box->priv->adj_x)); + g_return_if_fail(GTK_IS_ADJUSTMENT(box->priv->adj_y)); - gtk_widget_queue_draw (GTK_WIDGET(box)); + box->priv->selection_active = FALSE; + box->priv->selection_finalized = FALSE; - g_signal_emit (G_OBJECT (box), - gtk_databox_signals[ZOOMED_SIGNAL], 0, NULL); + gtk_adjustment_changed (box->priv->adj_x); + gtk_adjustment_changed (box->priv->adj_y); + + gtk_widget_queue_draw (GTK_WIDGET(box)); + + g_signal_emit (G_OBJECT (box), + gtk_databox_signals[ZOOMED_SIGNAL], 0, NULL); } -/** +/** * gtk_databox_zoom_to_selection: * @box: A #GtkDatabox widget * * This is equivalent to left-clicking into the selected area. * - * This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function - * then zooms to the area selected with the mouse. + * This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function + * then zooms to the area selected with the mouse. * * Side effect: The @box emits #GtkDatabox::zoomed. */ void -gtk_databox_zoom_to_selection (GtkDatabox * box) -{ - GtkWidget *widget; - - g_return_if_fail(GTK_IS_DATABOX(box)); - - widget = GTK_WIDGET (box); - - if (!box->priv->enable_zoom) - { - gtk_databox_selection_cancel (box); - return; - } - - box->priv->adj_x->value += (gfloat) (MIN (box->priv->marked.x, - box->priv->select.x)) - * box->priv->adj_x->page_size - / widget->allocation.width; - box->priv->adj_y->value += (gfloat) (MIN (box->priv->marked.y, - box->priv->select.y)) - * box->priv->adj_y->page_size - / widget->allocation.height; - - box->priv->adj_x->page_size *= - (gfloat) (ABS (box->priv->marked.x - box->priv->select.x) + 1) - / widget->allocation.width; - - box->priv->adj_y->page_size *= - (gfloat) (ABS (box->priv->marked.y - box->priv->select.y) + 1) - / widget->allocation.height; - - /* If we zoom too far into the data, we will get funny results, because - * of overflow effects. Therefore zooming is limited to box->zoom_limit. - */ - if (box->priv->adj_x->page_size < box->priv->zoom_limit) - { - box->priv->adj_x->value = (gfloat) MAX (0, - box->priv->adj_x->value - - (box->priv->zoom_limit - - box->priv->adj_x->page_size) / - 2.0); - box->priv->adj_x->page_size = box->priv->zoom_limit; - } - - if (box->priv->adj_y->page_size < box->priv->zoom_limit) - { - box->priv->adj_y->value = (gfloat) MAX (0, - box->priv->adj_y->value - - (box->priv->zoom_limit - - box->priv->adj_y->page_size) / - 2.0); - box->priv->adj_y->page_size = box->priv->zoom_limit; - } +gtk_databox_zoom_to_selection (GtkDatabox * box) { + GtkWidget *widget; + + g_return_if_fail(GTK_IS_DATABOX(box)); - gtk_databox_calculate_visible_limits(box); - gtk_databox_zoomed (box); + widget = GTK_WIDGET (box); + + if (!box->priv->enable_zoom) { + gtk_databox_selection_cancel (box); + return; + } + + box->priv->adj_x->value += (gfloat) (MIN (box->priv->marked.x, + box->priv->select.x)) + * box->priv->adj_x->page_size + / widget->allocation.width; + box->priv->adj_y->value += (gfloat) (MIN (box->priv->marked.y, + box->priv->select.y)) + * box->priv->adj_y->page_size + / widget->allocation.height; + + box->priv->adj_x->page_size *= + (gfloat) (ABS (box->priv->marked.x - box->priv->select.x) + 1) + / widget->allocation.width; + + box->priv->adj_y->page_size *= + (gfloat) (ABS (box->priv->marked.y - box->priv->select.y) + 1) + / widget->allocation.height; + + /* If we zoom too far into the data, we will get funny results, because + * of overflow effects. Therefore zooming is limited to box->zoom_limit. + */ + if (box->priv->adj_x->page_size < box->priv->zoom_limit) { + box->priv->adj_x->value = (gfloat) MAX (0, + box->priv->adj_x->value + - (box->priv->zoom_limit - + box->priv->adj_x->page_size) / + 2.0); + box->priv->adj_x->page_size = box->priv->zoom_limit; + } + + if (box->priv->adj_y->page_size < box->priv->zoom_limit) { + box->priv->adj_y->value = (gfloat) MAX (0, + box->priv->adj_y->value + - (box->priv->zoom_limit - + box->priv->adj_y->page_size) / + 2.0); + box->priv->adj_y->page_size = box->priv->zoom_limit; + } + + gtk_databox_calculate_visible_limits(box); + gtk_databox_zoomed (box); } -/** +/** * gtk_databox_zoom_out: * @box: A #GtkDatabox widget * * This is equivalent to right-clicking into the @box. * - * This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function - * then zooms out by a factor of 2 in both dimensions (the maximum is defined by the total + * This function works, if the attribute #enable-zoom is set to #TRUE. Calling the function + * then zooms out by a factor of 2 in both dimensions (the maximum is defined by the total * limits, see gtk_databox_set_total_limits()). - * + * * Side effect: The @box emits #GtkDatabox::zoomed. */ void -gtk_databox_zoom_out (GtkDatabox * box) -{ - if (!box->priv->enable_zoom) - { - return; - } - - box->priv->adj_x->page_size = MIN (1.0, box->priv->adj_x->page_size * 2); - box->priv->adj_y->page_size = MIN (1.0, box->priv->adj_y->page_size * 2); - box->priv->adj_x->value = - (box->priv->adj_x->page_size == 1.0) - ? 0 - : MAX (0, MIN (box->priv->adj_x->value - box->priv->adj_x->page_size / 4, - 1.0 - box->priv->adj_x->page_size)); - box->priv->adj_y->value = - (box->priv->adj_y->page_size == 1.0) - ? 0 - : MAX (0, MIN (box->priv->adj_y->value - box->priv->adj_y->page_size / 4, - 1.0 - box->priv->adj_y->page_size)); +gtk_databox_zoom_out (GtkDatabox * box) { + if (!box->priv->enable_zoom) { + return; + } + + box->priv->adj_x->page_size = MIN (1.0, box->priv->adj_x->page_size * 2); + box->priv->adj_y->page_size = MIN (1.0, box->priv->adj_y->page_size * 2); + box->priv->adj_x->value = + (box->priv->adj_x->page_size == 1.0) + ? 0 + : MAX (0, MIN (box->priv->adj_x->value - box->priv->adj_x->page_size / 4, + 1.0 - box->priv->adj_x->page_size)); + box->priv->adj_y->value = + (box->priv->adj_y->page_size == 1.0) + ? 0 + : MAX (0, MIN (box->priv->adj_y->value - box->priv->adj_y->page_size / 4, + 1.0 - box->priv->adj_y->page_size)); - gtk_databox_calculate_visible_limits(box); - gtk_databox_zoomed (box); + gtk_databox_calculate_visible_limits(box); + gtk_databox_zoomed (box); } -/** +/** * gtk_databox_zoom_home: * @box: A #GtkDatabox widget * * This is equivalent to shift right-clicking into the @box. * - * This function works, if the attribute #enable-zoom is set to #TRUE. It is equivalent to + * This function works, if the attribute #enable-zoom is set to #TRUE. It is equivalent to * calling the gtk_databox_set_visible_limits() with the total limits. - * + * */ void -gtk_databox_zoom_home (GtkDatabox * box) -{ - if (!box->priv->enable_zoom) - { - return; - } - - gtk_databox_set_visible_limits (box, - box->priv->total_left, box->priv->total_right, - box->priv->total_top, box->priv->total_bottom); +gtk_databox_zoom_home (GtkDatabox * box) { + if (!box->priv->enable_zoom) { + return; + } + + gtk_databox_set_visible_limits (box, + box->priv->total_left, box->priv->total_right, + box->priv->total_top, box->priv->total_bottom); } static void -gtk_databox_draw_selection (GtkDatabox * box, GdkRectangle * pixmapCopyRect) -{ - GtkWidget *widget = GTK_WIDGET (box); - - if (!box->priv->select_gc) - { - GdkGCValues values; - - values.foreground = widget->style->white; - values.function = GDK_XOR; - box->priv->select_gc = gtk_gc_get (widget->style->depth, - widget->style->colormap, - &values, - GDK_GC_FUNCTION | GDK_GC_FOREGROUND); - } - - - /* Draw a selection box in XOR mode onto the buffer backing_pixmap */ - gdk_draw_rectangle (box->priv->backing_pixmap, - box->priv->select_gc, - FALSE, - MIN (box->priv->marked.x, box->priv->select.x), - MIN (box->priv->marked.y, box->priv->select.y), - ABS (box->priv->marked.x - box->priv->select.x), - ABS (box->priv->marked.y - box->priv->select.y)); - - /* Copy a part of the backing_pixmap to the screen */ - if (pixmapCopyRect) - gdk_draw_drawable (widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE (box)], - box->priv->backing_pixmap, - pixmapCopyRect->x, - pixmapCopyRect->y, - pixmapCopyRect->x, - pixmapCopyRect->y, - pixmapCopyRect->width, pixmapCopyRect->height); +gtk_databox_draw_selection (GtkDatabox * box, GdkRectangle * pixmapCopyRect) { + GtkWidget *widget = GTK_WIDGET (box); + + if (!box->priv->select_gc) { + GdkGCValues values; + + values.foreground = widget->style->white; + values.function = GDK_XOR; + box->priv->select_gc = gtk_gc_get (widget->style->depth, + widget->style->colormap, + &values, + GDK_GC_FUNCTION | GDK_GC_FOREGROUND); + } + + + /* Draw a selection box in XOR mode onto the buffer backing_pixmap */ + gdk_draw_rectangle (box->priv->backing_pixmap, + box->priv->select_gc, + FALSE, + MIN (box->priv->marked.x, box->priv->select.x), + MIN (box->priv->marked.y, box->priv->select.y), + ABS (box->priv->marked.x - box->priv->select.x), + ABS (box->priv->marked.y - box->priv->select.y)); + + /* Copy a part of the backing_pixmap to the screen */ + if (pixmapCopyRect) + gdk_draw_drawable (widget->window, + widget->style->fg_gc[gtk_widget_get_state (widget)], + box->priv->backing_pixmap, + pixmapCopyRect->x, + pixmapCopyRect->y, + pixmapCopyRect->x, + pixmapCopyRect->y, + pixmapCopyRect->width, pixmapCopyRect->height); } static void -gtk_databox_adjustment_value_changed (GtkDatabox * box) -{ - gtk_databox_calculate_visible_limits (box); +gtk_databox_adjustment_value_changed (GtkDatabox * box) { + gtk_databox_calculate_visible_limits (box); - gtk_widget_queue_draw (GTK_WIDGET(box)); + gtk_widget_queue_draw (GTK_WIDGET(box)); } static void -gtk_databox_ruler_update (GtkDatabox * box) -{ - if (box->priv->ruler_x) - { - gtk_databox_ruler_set_range ( +gtk_databox_ruler_update (GtkDatabox * box) { + if (box->priv->ruler_x) { + gtk_databox_ruler_set_range ( GTK_DATABOX_RULER (box->priv->ruler_x), - box->priv->visible_left, - box->priv->visible_right, - 0.5 * (box->priv->visible_left + box->priv->visible_right)); - } - - if (box->priv->ruler_y) - { - gtk_databox_ruler_set_range ( + box->priv->visible_left, + box->priv->visible_right, + 0.5 * (box->priv->visible_left + box->priv->visible_right)); + } + + if (box->priv->ruler_y) { + gtk_databox_ruler_set_range ( GTK_DATABOX_RULER (box->priv->ruler_y), - box->priv->visible_top, - box->priv->visible_bottom, - 0.5 * (box->priv->visible_top + box->priv->visible_bottom)); - } + box->priv->visible_top, + box->priv->visible_bottom, + 0.5 * (box->priv->visible_top + box->priv->visible_bottom)); + } } -/** +/** * gtk_databox_auto_rescale: * @box: A #GtkDatabox widget * @border: Relative border width (e.g. 0.1 means that the border on each side is 10% of the data area). * - * This function is similar to gtk_databox_set_total_limits(). It sets the total limits - * to match the data extrema (see gtk_databox_calculate_extrema()). If you do not like data pixels exactly at the - * widget's border, you can add modify the limits using the border parameter: The limits are extended by - * @border*(max-min) if max!=min. If max==min, they are extended by @border*max (otherwise the data could not be + * This function is similar to gtk_databox_set_total_limits(). It sets the total limits + * to match the data extrema (see gtk_databox_calculate_extrema()). If you do not like data pixels exactly at the + * widget's border, you can add modify the limits using the border parameter: The limits are extended by + * @border*(max-min) if max!=min. If max==min, they are extended by @border*max (otherwise the data could not be * scaled to the pixel realm). * * After calling this function, x values grow from left to right, y values grow from bottom to top. @@ -1500,38 +1562,36 @@ * -2 if no datasets are available */ gint -gtk_databox_auto_rescale (GtkDatabox * box, gfloat border) -{ - gfloat min_x; - gfloat max_x; - gfloat min_y; - gfloat max_y; - gint extrema_success = gtk_databox_calculate_extrema (box, &min_x, &max_x, - &min_y, &max_y); - if (extrema_success) - return extrema_success; - else - { - gfloat width = max_x - min_x; - gfloat height = max_y - min_y; - - if (width == 0) width = max_x; - if (height == 0) height = max_y; - - min_x -= border * width; - max_x += border * width; - min_y -= border * height; - max_y += border * height; - } +gtk_databox_auto_rescale (GtkDatabox * box, gfloat border) { + gfloat min_x; + gfloat max_x; + gfloat min_y; + gfloat max_y; + gint extrema_success = gtk_databox_calculate_extrema (box, &min_x, &max_x, + &min_y, &max_y); + if (extrema_success) + return extrema_success; + else { + gfloat width = max_x - min_x; + gfloat height = max_y - min_y; + + if (width == 0) width = max_x; + if (height == 0) height = max_y; + + min_x -= border * width; + max_x += border * width; + min_y -= border * height; + max_y += border * height; + } - gtk_databox_set_total_limits (GTK_DATABOX (box), min_x, max_x, max_y, - min_y); + gtk_databox_set_total_limits (GTK_DATABOX (box), min_x, max_x, max_y, + min_y); - return 0; + return 0; } -/** +/** * gtk_databox_calculate_extrema: * @box: A #GtkDatabox widget * @min_x: Will be filled with the lowest x value of all datasets @@ -1539,7 +1599,7 @@ * @min_y: Will be filled with the lowest y value of all datasets * @max_y: Will be filled with the highest y value of all datasets * - * Determines the minimum and maximum x and y values of all + * Determines the minimum and maximum x and y values of all * #GtkDataboxGraph objects which have been added to the #GtkDatabox widget via gtk_databox_graph_add(). * * Return value: 0 on success, @@ -1548,126 +1608,111 @@ */ gint gtk_databox_calculate_extrema (GtkDatabox * box, - gfloat * min_x, gfloat * max_x, gfloat * min_y, - gfloat * max_y) -{ - GList *list; - gint return_val = -2; - gboolean first = TRUE; - - g_return_val_if_fail (GTK_IS_DATABOX (box), -1); - - list = g_list_last (box->priv->graphs); - - while (list) - { - gfloat graph_min_x; - gfloat graph_max_x; - gfloat graph_min_y; - gfloat graph_max_y; - gint value = -1; - - if (list->data) - { - value = - gtk_databox_graph_calculate_extrema (GTK_DATABOX_GRAPH - (list->data), &graph_min_x, - &graph_max_x, &graph_min_y, - &graph_max_y); - } - else - { - /* Do nothing if data == NULL */ - } - - if (value >= 0) - { - return_val = 0; - - if (first) - { - /* The min and max values need to be initialized with the - * first valid values from the graph - */ - *min_x = graph_min_x; - *max_x = graph_max_x; - *min_y = graph_min_y; - *max_y = graph_max_y; - - first = FALSE; - } - else - { - *min_x = MIN (*min_x, graph_min_x); - *min_y = MIN (*min_y, graph_min_y); - *max_x = MAX (*max_x, graph_max_x); - *max_y = MAX (*max_y, graph_max_y); - } - } - - list = g_list_previous (list); - } - - return return_val; + gfloat * min_x, gfloat * max_x, gfloat * min_y, + gfloat * max_y) { + GList *list; + gint return_val = -2; + gboolean first = TRUE; + + g_return_val_if_fail (GTK_IS_DATABOX (box), -1); + + list = g_list_last (box->priv->graphs); + while (list) { + gfloat graph_min_x; + gfloat graph_max_x; + gfloat graph_min_y; + gfloat graph_max_y; + gint value = -1; + + if (list->data) { + value = + gtk_databox_graph_calculate_extrema (GTK_DATABOX_GRAPH + (list->data), &graph_min_x, + &graph_max_x, &graph_min_y, + &graph_max_y); + } else { + /* Do nothing if data == NULL */ + } + + if (value >= 0) { + return_val = 0; + + if (first) { + /* The min and max values need to be initialized with the + * first valid values from the graph + */ + *min_x = graph_min_x; + *max_x = graph_max_x; + *min_y = graph_min_y; + *max_y = graph_max_y; + + first = FALSE; + } else { + *min_x = MIN (*min_x, graph_min_x); + *min_y = MIN (*min_y, graph_min_y); + *max_x = MAX (*max_x, graph_max_x); + *max_y = MAX (*max_y, graph_max_y); + } + } + + list = g_list_previous (list); + } + return return_val; } static gfloat -gtk_databox_get_offset_x (GtkDatabox* box) -{ - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - return (box->priv->visible_left - box->priv->total_left) - / (box->priv->total_right - box->priv->total_left); - else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) - return log2 (box->priv->visible_left / box->priv->total_left) - / log2 (box->priv->total_right / box->priv->total_left); - else - return log10 (box->priv->visible_left / box->priv->total_left) - / log10 (box->priv->total_right / box->priv->total_left); +gtk_databox_get_offset_x (GtkDatabox* box) { + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) + return (box->priv->visible_left - box->priv->total_left) + / (box->priv->total_right - box->priv->total_left); + else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) + return log2 (box->priv->visible_left / box->priv->total_left) + / log2 (box->priv->total_right / box->priv->total_left); + else + return log10 (box->priv->visible_left / box->priv->total_left) + / log10 (box->priv->total_right / box->priv->total_left); } static gfloat -gtk_databox_get_page_size_x (GtkDatabox* box) -{ - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - return (box->priv->visible_left - box->priv->visible_right) - / (box->priv->total_left - box->priv->total_right); - else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) - return log2 (box->priv->visible_left / box->priv->visible_right) - / log2 (box->priv->total_left / box->priv->total_right); - else - return log10 (box->priv->visible_left / box->priv->visible_right) - / log10 (box->priv->total_left / box->priv->total_right); +gtk_databox_get_page_size_x (GtkDatabox* box) { + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) + return (box->priv->visible_left - box->priv->visible_right) + / (box->priv->total_left - box->priv->total_right); + else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) + return log2 (box->priv->visible_left / box->priv->visible_right) + / log2 (box->priv->total_left / box->priv->total_right); + else + return log10 (box->priv->visible_left / box->priv->visible_right) + / log10 (box->priv->total_left / box->priv->total_right); } static gfloat -gtk_databox_get_offset_y (GtkDatabox* box) -{ - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - return (box->priv->visible_top - box->priv->total_top) - / (box->priv->total_bottom - box->priv->total_top); - else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) - return log2 (box->priv->visible_top / box->priv->total_top) - / log2 (box->priv->total_bottom / box->priv->total_top); - else - return log10 (box->priv->visible_top / box->priv->total_top) - / log10 (box->priv->total_bottom / box->priv->total_top); +gtk_databox_get_offset_y (GtkDatabox* box) { + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) + return (box->priv->visible_top - box->priv->total_top) + / (box->priv->total_bottom - box->priv->total_top); + else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) + return log2 (box->priv->visible_top / box->priv->total_top) + / log2 (box->priv->total_bottom / box->priv->total_top); + else + return log10 (box->priv->visible_top / box->priv->total_top) + / log10 (box->priv->total_bottom / box->priv->total_top); } static gfloat -gtk_databox_get_page_size_y (GtkDatabox* box) -{ - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - return (box->priv->visible_top - box->priv->visible_bottom) - / (box->priv->total_top - box->priv->total_bottom); - else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) - return log2 (box->priv->visible_top / box->priv->visible_bottom) - / log2 (box->priv->total_top / box->priv->total_bottom); - else - return log10 (box->priv->visible_top / box->priv->visible_bottom) - / log10 (box->priv->total_top / box->priv->total_bottom); +gtk_databox_get_page_size_y (GtkDatabox* box) { + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) + return (box->priv->visible_top - box->priv->visible_bottom) + / (box->priv->total_top - box->priv->total_bottom); + else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) + return log2 (box->priv->visible_top / box->priv->visible_bottom) + / log2 (box->priv->total_top / box->priv->total_bottom); + else + return log10 (box->priv->visible_top / box->priv->visible_bottom) + / log10 (box->priv->total_top / box->priv->total_bottom); } -/** +/** * gtk_databox_set_total_limits: * @box: A #GtkDatabox widget * @left: Left total limit @@ -1675,9 +1720,9 @@ * @top: Top total limit * @bottom: Bottom total limit * - * This function is used to set the limits of the total + * This function is used to set the limits of the total * display area of @box. - * This function can be used to invert the orientation of the displayed graphs, + * This function can be used to invert the orientation of the displayed graphs, * e.g. @top=-1000 and @bottom=0. * * Side effect: The @box also internally calls gtk_databox_set_visible_limits() with the same values. @@ -1685,22 +1730,21 @@ */ void gtk_databox_set_total_limits (GtkDatabox * box, - gfloat left, gfloat right, - gfloat top, gfloat bottom) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); - g_return_if_fail (left != right); - g_return_if_fail (top != bottom); - - box->priv->total_left = left; - box->priv->total_right = right; - box->priv->total_top = top; - box->priv->total_bottom = bottom; + gfloat left, gfloat right, + gfloat top, gfloat bottom) { + g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (left != right); + g_return_if_fail (top != bottom); - gtk_databox_set_visible_limits(box, left, right, top, bottom); + box->priv->total_left = left; + box->priv->total_right = right; + box->priv->total_top = top; + box->priv->total_bottom = bottom; + + gtk_databox_set_visible_limits(box, left, right, top, bottom); } -/** +/** * gtk_databox_set_visible_limits: * @box: A #GtkDatabox widget * @left: Left visible limit @@ -1708,12 +1752,12 @@ * @top: Top visible limit * @bottom: Bottom visible limit * - * This function is used to set the limits of the visible - * display area of @box. The visible display area can be section of the total + * This function is used to set the limits of the visible + * display area of @box. The visible display area can be section of the total * area, i.e. the @box zooms in, showing only a part of the complete picture. * - * The orientation of the values have to be the same as in gtk_databox_set_total_limits() and - * the visible limits have to be within the total limits. The + * The orientation of the values have to be the same as in gtk_databox_set_total_limits() and + * the visible limits have to be within the total limits. The * values will not be used otherwise. * * Side effect: The @box emits #GtkDatabox::zoomed. @@ -1721,47 +1765,46 @@ */ void gtk_databox_set_visible_limits (GtkDatabox * box, - gfloat left, gfloat right, - gfloat top, gfloat bottom) -{ - gboolean visible_inside_total = FALSE; + gfloat left, gfloat right, + gfloat top, gfloat bottom) { + gboolean visible_inside_total = FALSE; - g_return_if_fail (GTK_IS_DATABOX (box)); + g_return_if_fail (GTK_IS_DATABOX (box)); - visible_inside_total = - ((box->priv->total_left <= left && left < right - && right <= box->priv->total_right) - || (box->priv->total_left >= left && left > right - && right >= box->priv->total_right)) - && - ((box->priv->total_bottom <= bottom && bottom < top - && top <= box->priv->total_top) - || (box->priv->total_bottom >= bottom && bottom > top - && top >= box->priv->total_top)); + visible_inside_total = + ((box->priv->total_left <= left && left < right + && right <= box->priv->total_right) + || (box->priv->total_left >= left && left > right + && right >= box->priv->total_right)) + && + ((box->priv->total_bottom <= bottom && bottom < top + && top <= box->priv->total_top) + || (box->priv->total_bottom >= bottom && bottom > top + && top >= box->priv->total_top)); - g_return_if_fail (visible_inside_total); + g_return_if_fail (visible_inside_total); - box->priv->visible_left = left; - box->priv->visible_right = right; - box->priv->visible_top = top; - box->priv->visible_bottom = bottom; + box->priv->visible_left = left; + box->priv->visible_right = right; + box->priv->visible_top = top; + box->priv->visible_bottom = bottom; - gtk_databox_calculate_translation_factors (box); + gtk_databox_calculate_translation_factors (box); - box->priv->adj_x->value = gtk_databox_get_offset_x (box); - box->priv->adj_x->page_size = gtk_databox_get_page_size_x (box); - box->priv->adj_y->value = gtk_databox_get_offset_y (box); - box->priv->adj_y->page_size = gtk_databox_get_page_size_y (box); + box->priv->adj_x->value = gtk_databox_get_offset_x (box); + box->priv->adj_x->page_size = gtk_databox_get_page_size_x (box); + box->priv->adj_y->value = gtk_databox_get_offset_y (box); + box->priv->adj_y->page_size = gtk_databox_get_page_size_y (box); - /* Update rulers */ - gtk_databox_ruler_update(box); + /* Update rulers */ + gtk_databox_ruler_update(box); - gtk_databox_calculate_translation_factors (box); + gtk_databox_calculate_translation_factors (box); - gtk_databox_zoomed (box); + gtk_databox_zoomed (box); } -/** +/** * gtk_databox_calculate_visible_limits: * @box: A #GtkDatabox widget * @@ -1769,68 +1812,61 @@ * and calls gtk_databox_set_visible_limits(); */ static void -gtk_databox_calculate_visible_limits (GtkDatabox * box) -{ - if (!GTK_WIDGET_VISIBLE (box)) - return; - - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - { - box->priv->visible_left = - box->priv->total_left - + (box->priv->total_right - box->priv->total_left) - * box->priv->adj_x->value; - box->priv->visible_right = - box->priv->total_left - + (box->priv->total_right - box->priv->total_left) - * (box->priv->adj_x->value + box->priv->adj_x->page_size); - } - else - { - box->priv->visible_left = - box->priv->total_left - * pow (box->priv->total_right / box->priv->total_left, - box->priv->adj_x->value); - box->priv->visible_right = - box->priv->total_left - * pow (box->priv->total_right / box->priv->total_left, +gtk_databox_calculate_visible_limits (GtkDatabox * box) { + if (!gtk_widget_get_visible (GTK_WIDGET(box))) + return; + + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) { + box->priv->visible_left = + box->priv->total_left + + (box->priv->total_right - box->priv->total_left) + * box->priv->adj_x->value; + box->priv->visible_right = + box->priv->total_left + + (box->priv->total_right - box->priv->total_left) + * (box->priv->adj_x->value + box->priv->adj_x->page_size); + } else { + box->priv->visible_left = + box->priv->total_left + * pow (box->priv->total_right / box->priv->total_left, + box->priv->adj_x->value); + box->priv->visible_right = + box->priv->total_left + * pow (box->priv->total_right / box->priv->total_left, box->priv->adj_x->value + box->priv->adj_x->page_size); - } + } - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - { - box->priv->visible_top = - box->priv->total_top - + (box->priv->total_bottom - box->priv->total_top) - * box->priv->adj_y->value; - box->priv->visible_bottom = - box->priv->total_top - + (box->priv->total_bottom - box->priv->total_top) - * (box->priv->adj_y->value + box->priv->adj_y->page_size); - } - else - { - box->priv->visible_top = - box->priv->total_top - * pow (box->priv->total_bottom / box->priv->total_top, + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) { + box->priv->visible_top = + box->priv->total_top + + (box->priv->total_bottom - box->priv->total_top) + * box->priv->adj_y->value; + box->priv->visible_bottom = + box->priv->total_top + + (box->priv->total_bottom - box->priv->total_top) + * (box->priv->adj_y->value + box->priv->adj_y->page_size); + } else { + box->priv->visible_top = + box->priv->total_top + * pow (box->priv->total_bottom / box->priv->total_top, box->priv->adj_y->value), - box->priv->visible_bottom = - box->priv->total_top - * pow (box->priv->total_bottom / box->priv->total_top, - box->priv->adj_y->value + box->priv->adj_y->page_size); - } + box->priv->visible_bottom = + box->priv->total_top + * pow (box->priv->total_bottom / box->priv->total_top, + box->priv->adj_y->value + box->priv->adj_y->page_size); + } - /* Adjustments are the basis for the calculations in this function - * so they do not need to be updated - */ + /* Adjustments are the basis for the calculations in this function + * so they do not need to be updated + */ - /* Update rulers */ - gtk_databox_ruler_update(box); + /* Update rulers */ + gtk_databox_ruler_update(box); - gtk_databox_calculate_translation_factors (box); + gtk_databox_calculate_translation_factors (box); } -/** +/** * gtk_databox_get_total_limits: * @box: A #GtkDatabox widget * @left: Space for total left value or #NULL @@ -1842,22 +1878,21 @@ */ void gtk_databox_get_total_limits (GtkDatabox * box, - gfloat * left, gfloat * right, - gfloat * top, gfloat * bottom) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); - - if (left) - *left = box->priv->total_left; - if (right) - *right = box->priv->total_right; - if (top) - *top = box->priv->total_top; - if (bottom) - *bottom = box->priv->total_bottom; + gfloat * left, gfloat * right, + gfloat * top, gfloat * bottom) { + g_return_if_fail (GTK_IS_DATABOX (box)); + + if (left) + *left = box->priv->total_left; + if (right) + *right = box->priv->total_right; + if (top) + *top = box->priv->total_top; + if (bottom) + *bottom = box->priv->total_bottom; } -/** +/** * gtk_databox_get_visible_limits: * @box: A #GtkDatabox widget * @left: Space for visible left value or #NULL @@ -1865,29 +1900,28 @@ * @top: Space for visible top value or #NULL * @bottom: Space for visible bottom value or #NULL * - * Gives the current visible limits. These differ from those given by gtk_databox_get_total_limits() if + * Gives the current visible limits. These differ from those given by gtk_databox_get_total_limits() if * you zoomed into the data for instance by gtk_databox_zoom_to_selection() or gtk_databox_set_visible_limits() (these values * can be changed by scrolling, of course). */ void gtk_databox_get_visible_limits (GtkDatabox * box, - gfloat * left, gfloat * right, - gfloat * top, gfloat * bottom) -{ - g_return_if_fail (GTK_IS_DATABOX (box)); - - if (left) - *left = box->priv->visible_left; - if (right) - *right = box->priv->visible_right; - if (top) - *top = box->priv->visible_top; - if (bottom) - *bottom = box->priv->visible_bottom; + gfloat * left, gfloat * right, + gfloat * top, gfloat * bottom) { + g_return_if_fail (GTK_IS_DATABOX (box)); + + if (left) + *left = box->priv->visible_left; + if (right) + *right = box->priv->visible_right; + if (top) + *top = box->priv->visible_top; + if (bottom) + *bottom = box->priv->visible_bottom; } -/** +/** * gtk_databox_graph_add: * @box: A #GtkDatabox widget * @graph: A graph, e.g. a #GtkDataboxPoints or a #GtkDataboxGrid object @@ -1899,43 +1933,62 @@ * Return value: 0 on success, -1 otherwise */ gint -gtk_databox_graph_add (GtkDatabox * box, GtkDataboxGraph * graph) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), -1); - g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); +gtk_databox_graph_add (GtkDatabox * box, GtkDataboxGraph * graph) { + g_return_val_if_fail (GTK_IS_DATABOX (box), -1); + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); - box->priv->graphs = g_list_append (box->priv->graphs, graph); + box->priv->graphs = g_list_append (box->priv->graphs, graph); - return (box->priv->graphs == NULL) ? -1 : 0; + return (box->priv->graphs == NULL) ? -1 : 0; } -/** +/** + * gtk_databox_graph_add_front: + * @box: A #GtkDatabox widget + * @graph: A graph, e.g. a #GtkDataboxPoints or a #GtkDataboxGrid object + * + * Adds the @graph to the @box and will be plotted on top. The next time the @box is re-drawn, the graph will be shown. + * + * It might be becessary to modify the total_limits in order for the graph to be displayed properly (see gtk_databox_set_total_limits()). + * + * Return value: 0 on success, -1 otherwise + */ +gint +gtk_databox_graph_add_front (GtkDatabox * box, GtkDataboxGraph * graph) { + + g_return_val_if_fail (GTK_IS_DATABOX (box), -1); + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); + + box->priv->graphs = g_list_prepend (box->priv->graphs, graph); + + return (box->priv->graphs == NULL) ? -1 : 0; +} + +/** * gtk_databox_graph_remove: * @box: A #GtkDatabox widget * @graph: A graph, e.g. a #GtkDataboxPoints or a #GtkDataboxGrid object * - * Removes the @graph from the @box once. The next time the @box is re-drawn, the graph will not be shown (unless it was added more + * Removes the @graph from the @box once. The next time the @box is re-drawn, the graph will not be shown (unless it was added more * than once). * * Return value: 0 on success, -1 otherwise */ gint -gtk_databox_graph_remove (GtkDatabox * box, GtkDataboxGraph * graph) -{ - GList *list; +gtk_databox_graph_remove (GtkDatabox * box, GtkDataboxGraph * graph) { + GList *list; - g_return_val_if_fail (GTK_IS_DATABOX (box), -1); - g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); + g_return_val_if_fail (GTK_IS_DATABOX (box), -1); + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); - list = g_list_find (box->priv->graphs, graph); - g_return_val_if_fail (list, -1); + list = g_list_find (box->priv->graphs, graph); + g_return_val_if_fail (list, -1); - box->priv->graphs = g_list_delete_link (box->priv->graphs, list); - - return 0; + box->priv->graphs = g_list_delete_link (box->priv->graphs, list); + return 0; } -/** +/** * gtk_databox_graph_remove_all: * @box: A #GtkDatabox widget * @@ -1944,18 +1997,16 @@ * Return value: 0 on success, -1 otherwise */ gint -gtk_databox_graph_remove_all (GtkDatabox * box) -{ - g_return_val_if_fail (GTK_IS_DATABOX (box), -1); - - g_list_free (box->priv->graphs); +gtk_databox_graph_remove_all (GtkDatabox * box) { + g_return_val_if_fail (GTK_IS_DATABOX (box), -1); - box->priv->graphs = 0; + g_list_free (box->priv->graphs); + box->priv->graphs = NULL; - return 0; + return 0; } -/** +/** * gtk_databox_values_to_pixels: * @box: A #GtkDatabox widget * @len: Number of values/pixels @@ -1967,43 +2018,41 @@ */ void gtk_databox_values_to_pixels (GtkDatabox * box, guint len, - const gfloat * values_x, - const gfloat * values_y, - GdkPoint * pixels) -{ - guint i; - - for (i = 0; i < len; ++i, ++values_x, ++values_y, ++pixels) - { - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - pixels->x = - (*values_x - - box->priv->visible_left) * box->priv->translation_factor_x; - else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) - pixels->x = - log2 (*values_x / box->priv->visible_left) * - box->priv->translation_factor_x; - else - pixels->x = - log10 (*values_x / box->priv->visible_left) * - box->priv->translation_factor_x; - - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - pixels->y = - (*values_y - - box->priv->visible_top) * box->priv->translation_factor_y; - else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) - pixels->y = - log2 (*values_y / box->priv->visible_top) * - box->priv->translation_factor_y; - else - pixels->y = - log10 (*values_y / box->priv->visible_top) * - box->priv->translation_factor_y; - } + const gfloat * values_x, + const gfloat * values_y, + GdkPoint * pixels) { + guint i; + + for (i = 0; i < len; ++i, ++values_x, ++values_y, ++pixels) { + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) + pixels->x = + (*values_x - + box->priv->visible_left) * box->priv->translation_factor_x; + else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) + pixels->x = + log2 (*values_x / box->priv->visible_left) * + box->priv->translation_factor_x; + else + pixels->x = + log10 (*values_x / box->priv->visible_left) * + box->priv->translation_factor_x; + + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) + pixels->y = + (*values_y - + box->priv->visible_top) * box->priv->translation_factor_y; + else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) + pixels->y = + log2 (*values_y / box->priv->visible_top) * + box->priv->translation_factor_y; + else + pixels->y = + log10 (*values_y / box->priv->visible_top) * + box->priv->translation_factor_y; + } } -/** +/** * gtk_databox_value_to_pixel_x: * @box: A #GtkDatabox widget * @value: An x value @@ -2014,21 +2063,20 @@ * Return value: Pixel coordinate */ gint16 -gtk_databox_value_to_pixel_x (GtkDatabox * box, gfloat value) -{ - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - return (value - - box->priv->visible_left) * - box->priv->translation_factor_x; - else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) - return log2 (value / box->priv->visible_left) * - box->priv->translation_factor_x; - else - return log10 (value / box->priv->visible_left) * - box->priv->translation_factor_x; +gtk_databox_value_to_pixel_x (GtkDatabox * box, gfloat value) { + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) + return (value - + box->priv->visible_left) * + box->priv->translation_factor_x; + else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) + return log2 (value / box->priv->visible_left) * + box->priv->translation_factor_x; + else + return log10 (value / box->priv->visible_left) * + box->priv->translation_factor_x; } -/** +/** * gtk_databox_value_to_pixel_y: * @box: A #GtkDatabox widget * @value: A y value @@ -2039,20 +2087,19 @@ * Return value: Pixel coordinate */ gint16 -gtk_databox_value_to_pixel_y (GtkDatabox * box, gfloat value) -{ - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - return (value - - box->priv->visible_top) * box->priv->translation_factor_y; - else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) - return log2 (value / box->priv->visible_top) * - box->priv->translation_factor_y; - else - return log10 (value / box->priv->visible_top) * - box->priv->translation_factor_y; +gtk_databox_value_to_pixel_y (GtkDatabox * box, gfloat value) { + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) + return (value - + box->priv->visible_top) * box->priv->translation_factor_y; + else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) + return log2 (value / box->priv->visible_top) * + box->priv->translation_factor_y; + else + return log10 (value / box->priv->visible_top) * + box->priv->translation_factor_y; } -/** +/** * gtk_databox_pixel_to_value_x: * @box: A #GtkDatabox widget * @pixel: A horizontal pixel coordinate @@ -2063,24 +2110,23 @@ * Return value: x value */ gfloat -gtk_databox_pixel_to_value_x (GtkDatabox * box, gint16 pixel) -{ - if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) - return box->priv->visible_left + - pixel / box->priv->translation_factor_x; - else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) - return box->priv->visible_left * pow (2, - pixel / - box->priv-> - translation_factor_x); - else - return box->priv->visible_left * pow (10, - pixel / - box->priv-> - translation_factor_x); +gtk_databox_pixel_to_value_x (GtkDatabox * box, gint16 pixel) { + if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LINEAR) + return box->priv->visible_left + + pixel / box->priv->translation_factor_x; + else if (box->priv->scale_type_x == GTK_DATABOX_SCALE_LOG2) + return box->priv->visible_left * pow (2, + pixel / + box->priv-> + translation_factor_x); + else + return box->priv->visible_left * pow (10, + pixel / + box->priv-> + translation_factor_x); } -/** +/** * gtk_databox_pixel_to_value_y: * @box: A #GtkDatabox widget * @pixel: A vertical pixel coordinate @@ -2091,24 +2137,23 @@ * Return value: y value */ gfloat -gtk_databox_pixel_to_value_y (GtkDatabox * box, gint16 pixel) -{ - if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) - return box->priv->visible_top + - pixel / box->priv->translation_factor_y; - else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) - return box->priv->visible_top * pow (2, - pixel / - box->priv-> - translation_factor_y); - else - return box->priv->visible_top * pow (10, - pixel / - box->priv-> - translation_factor_y); +gtk_databox_pixel_to_value_y (GtkDatabox * box, gint16 pixel) { + if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LINEAR) + return box->priv->visible_top + + pixel / box->priv->translation_factor_y; + else if (box->priv->scale_type_y == GTK_DATABOX_SCALE_LOG2) + return box->priv->visible_top * pow (2, + pixel / + box->priv-> + translation_factor_y); + else + return box->priv->visible_top * pow (10, + pixel / + box->priv-> + translation_factor_y); } -/** +/** * gtk_databox_create_box_with_scrollbars_and_rulers: * @p_box: Will contain a pointer to a #GtkDatabox widget * @p_table: Will contain a pointer to a #GtkTable widget @@ -2117,74 +2162,156 @@ * @ruler_x: Whether to attach a horizontal ruler * @ruler_y: Whether to attach a vertical ruler * - * This is a convenience function which creates a #GtkDatabox widget in a - * GtkTable widget optionally accompanied by scrollbars and rulers. You only + * This is a convenience function which creates a #GtkDatabox widget in a + * GtkTable widget optionally accompanied by scrollbars and rulers. You only * have to fill in the data (gtk_databox_graph_add()) and adjust the limits * (gtk_databox_set_total_limits() or gtk_databox_auto_rescale()). * + * This function produces the default databox with rulers at the top left and + * scroll bars at the bottom right. + * * @see_also: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y() */ void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget ** p_box, - GtkWidget ** p_table, - gboolean scrollbar_x, - gboolean scrollbar_y, - gboolean ruler_x, - gboolean ruler_y) -{ - GtkTable *table; - GtkDatabox *box; - GtkWidget *scrollbar; - GtkWidget *ruler; - - *p_table = gtk_table_new (3, 3, FALSE); - *p_box = gtk_databox_new (); - box = GTK_DATABOX (*p_box); - table = GTK_TABLE (*p_table); - - gtk_table_attach (table, GTK_WIDGET (box), 1, 2, 1, 2, - GTK_FILL | GTK_EXPAND | GTK_SHRINK, - GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); - - if (scrollbar_x) - { - scrollbar = gtk_hscrollbar_new (NULL); - gtk_databox_set_adjustment_x (box, - gtk_range_get_adjustment (GTK_RANGE - (scrollbar))); - gtk_table_attach (table, scrollbar, 1, 2, 2, 3, - GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 0, 0); - } - - if (scrollbar_y) - { - scrollbar = gtk_vscrollbar_new (NULL); - gtk_databox_set_adjustment_y (box, - gtk_range_get_adjustment (GTK_RANGE - (scrollbar))); - gtk_table_attach (table, scrollbar, 2, 3, 1, 2, GTK_FILL, - GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); - } - - if (ruler_x) - { - ruler = gtk_databox_ruler_new (GTK_ORIENTATION_HORIZONTAL); - gtk_databox_ruler_set_scale_type (GTK_DATABOX_RULER (ruler), - box->priv->scale_type_x); - gtk_table_attach (table, ruler, 1, 2, 0, 1, - GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 0, 0); - gtk_databox_set_ruler_x (box, GTK_DATABOX_RULER (ruler)); - } - - if (ruler_y) - { - ruler = gtk_databox_ruler_new (GTK_ORIENTATION_VERTICAL); - gtk_databox_ruler_set_scale_type (GTK_DATABOX_RULER (ruler), - box->priv->scale_type_y); - gtk_table_attach (table, ruler, 0, 1, 1, 2, GTK_FILL, - GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); - gtk_databox_set_ruler_y (box, GTK_DATABOX_RULER (ruler)); - } + GtkWidget ** p_table, + gboolean scrollbar_x, + gboolean scrollbar_y, + gboolean ruler_x, + gboolean ruler_y) { + /* create with rulers top left by default */ + gtk_databox_create_box_with_scrollbars_and_rulers_positioned (p_box, p_table, scrollbar_x, scrollbar_y, ruler_x, ruler_y, TRUE, TRUE); } - +/** + * gtk_databox_create_box_with_scrollbars_and_rulers_positioned: + * @p_box: Will contain a pointer to a #GtkDatabox widget + * @p_table: Will contain a pointer to a #GtkTable widget + * @scrollbar_x: Whether to attach a horizontal scrollbar + * @scrollbar_y: Whether to attach a vertical scrollbar + * @ruler_x: Whether to attach a horizontal ruler + * @ruler_y: Whether to attach a vertical ruler + * @ruler_x_top: Whether to put the ruler_x up the top + * @ruler_y_left: Whether to put the ruler_y on the left + * + * This is a convenience function which creates a #GtkDatabox widget in a + * GtkTable widget optionally accompanied by scrollbars and rulers. You only + * have to fill in the data (gtk_databox_graph_add()) and adjust the limits + * (gtk_databox_set_total_limits() or gtk_databox_auto_rescale()). + * + * This function produces the default databox with rulers at the top left and + * scroll bars at the bottom right. + * + * @see_also: gtk_databox_new(), gtk_databox_set_adjustment_x(), gtk_databox_set_adjustment_y(), gtk_databox_set_ruler_x(), gtk_databox_set_ruler_y(), gtk_databox_create_box_with_scrollbars_and_rulers() + */ +void +gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget ** p_box, + GtkWidget ** p_table, + gboolean scrollbar_x, + gboolean scrollbar_y, + gboolean ruler_x, + gboolean ruler_y, + gboolean ruler_x_top, + gboolean ruler_y_left) { + GtkTable *table; + GtkDatabox *box; + GtkWidget *scrollbar; + GtkWidget *ruler; + + gint left_col, right_col, top_row, bot_row; + + *p_table = gtk_table_new (3, 3, FALSE); + *p_box = gtk_databox_new (); + box = GTK_DATABOX (*p_box); + table = GTK_TABLE (*p_table); + + left_col=1; + right_col=2; + top_row=1; + bot_row=2; + gtk_table_attach (table, GTK_WIDGET (box), left_col, right_col, top_row, bot_row, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); + + if (scrollbar_x) { + scrollbar = gtk_hscrollbar_new (NULL); + gtk_databox_set_adjustment_x (box, + gtk_range_get_adjustment (GTK_RANGE + (scrollbar))); + if (ruler_x_top) { + left_col=1; + right_col=2; + top_row=2; + bot_row=3; + } else { + left_col=1; + right_col=2; + top_row=0; + bot_row=1; + } + gtk_table_attach (table, scrollbar, left_col, right_col, top_row, bot_row, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 0, 0); + } + + if (scrollbar_y) { + scrollbar = gtk_vscrollbar_new (NULL); + gtk_databox_set_adjustment_y (box, + gtk_range_get_adjustment (GTK_RANGE + (scrollbar))); + if (ruler_y_left) { + left_col=2; + right_col=3; + top_row=1; + bot_row=2; + } else { + left_col=0; + right_col=1; + top_row=1; + bot_row=2; + } + gtk_table_attach (table, scrollbar, left_col, right_col, top_row, bot_row, + GTK_FILL, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); + } + + if (ruler_x) { + ruler = gtk_databox_ruler_new (GTK_ORIENTATION_HORIZONTAL); + gtk_databox_ruler_set_scale_type (GTK_DATABOX_RULER (ruler), + box->priv->scale_type_x); + if (ruler_x_top) { + left_col=1; + right_col=2; + top_row=0; + bot_row=1; + } else { + gtk_databox_ruler_set_invert_edge(GTK_DATABOX_RULER(ruler), TRUE); /* set the ruler to reverse its edge */ + left_col=1; + right_col=2; + top_row=2; + bot_row=3; + } + gtk_table_attach (table, ruler, left_col, right_col, top_row, bot_row, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 0, 0); + gtk_databox_set_ruler_x (box, GTK_DATABOX_RULER (ruler)); + } + + if (ruler_y) { + ruler = gtk_databox_ruler_new (GTK_ORIENTATION_VERTICAL); + gtk_databox_ruler_set_scale_type (GTK_DATABOX_RULER (ruler), + box->priv->scale_type_y); + if (ruler_y_left) { + left_col=0; + right_col=1; + top_row=1; + bot_row=2; + } else { + gtk_databox_ruler_set_invert_edge(GTK_DATABOX_RULER(ruler), TRUE); /* set the ruler to reverse its edge */ + left_col=2; + right_col=3; + top_row=1; + bot_row=2; + } + gtk_table_attach (table, ruler, left_col, right_col, top_row, bot_row, + GTK_FILL, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); + gtk_databox_set_ruler_y (box, GTK_DATABOX_RULER (ruler)); + } +} diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox.h libgtkdatabox-0.9.2.0/gtk/gtkdatabox.h --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox.h 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox.h 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -32,21 +32,21 @@ * @include: gtkdatabox.h * @see_also: #GtkDataboxGraph, #GtkDataboxPoints, #GtkDataboxLines, #GtkDataboxMarkers, #GtkDataboxGrid * - * #GtkDatabox is a widget for the GTK+ library designed to display - * large amounts of numerical data quickly and easily. It allows - * for one or more data sets of thousands of data points (X and Y coordinates) - * to be displayed and updated in split seconds. - * - * It offers the ability to zoom into and out of the data, and to navigate - * through your data by scrolling. - * - * In addition to rulers and a simple - * coordinate cross, it allows you to add one (or even more) configurable grids - * like on an oscilloscope. - * - * Data may be presented as dots, lines connecting the data, - * or vertical bars. The widget allows you to easily transform pixel - * coordinates into data coordinates, thus allowing you to easily create + * #GtkDatabox is a widget for the GTK+ library designed to display + * large amounts of numerical data quickly and easily. It allows + * for one or more data sets of thousands of data points (X and Y coordinates) + * to be displayed and updated in split seconds. + * + * It offers the ability to zoom into and out of the data, and to navigate + * through your data by scrolling. + * + * In addition to rulers and a simple + * coordinate cross, it allows you to add one (or even more) configurable grids + * like on an oscilloscope. + * + * Data may be presented as dots, lines connecting the data, + * or vertical bars. The widget allows you to easily transform pixel + * coordinates into data coordinates, thus allowing you to easily create * powerful applications for data analysis. * **/ @@ -68,130 +68,144 @@ GtkDataboxClass)) - typedef struct _GtkDataboxClass GtkDataboxClass; +typedef struct _GtkDataboxClass GtkDataboxClass; + +/** + * GtkDataboxPrivate + * + * A private data structure used by the #GtkDatabox. It shields all internal things + * from developers who are just using the widget. + * + **/ +typedef struct _GtkDataboxPrivate GtkDataboxPrivate; + +typedef struct +{ + gfloat x1; + gfloat x2; + gfloat y1; + gfloat y2; +} GtkDataboxValueRectangle; + +/** + * _GtkDatabox + * @box: The parent object + * @priv: A private structure containing internal data. + * + * Implementation of #GtkDatabox. + * + **/ +struct _GtkDatabox +{ + /*< private >*/ + GtkWidget box; + + GtkDataboxPrivate *priv; +}; + +struct _GtkDataboxClass +{ + GtkWidgetClass parent_class; + + void (*zoomed) (GtkDatabox * box); + void (*selection_started) (GtkDatabox * box, + GtkDataboxValueRectangle * selectionValues); + void (*selection_changed) (GtkDatabox * box, + GtkDataboxValueRectangle * selectionValues); + void (*selection_finalized) (GtkDatabox * box, + GtkDataboxValueRectangle * + selectionValues); + void (*selection_canceled) (GtkDatabox * box); +}; + +GType gtk_databox_get_type (void); + +GtkWidget *gtk_databox_new (void); + +gint gtk_databox_graph_add (GtkDatabox * box, GtkDataboxGraph * graph); +gint gtk_databox_graph_add_front (GtkDatabox * box, GtkDataboxGraph * graph); + +gint gtk_databox_graph_remove (GtkDatabox * box, GtkDataboxGraph * graph); +gint gtk_databox_graph_remove_all (GtkDatabox * box); + +gint gtk_databox_auto_rescale (GtkDatabox * box, gfloat border); +gint gtk_databox_calculate_extrema (GtkDatabox * box, + gfloat * min_x, gfloat * max_x, + gfloat * min_y, gfloat * max_y); + +void gtk_databox_set_total_limits (GtkDatabox * box, + gfloat left, gfloat right, + gfloat top, gfloat bottom); +void gtk_databox_set_visible_limits (GtkDatabox * box, + gfloat left, gfloat right, + gfloat top, gfloat bottom); +void gtk_databox_get_total_limits (GtkDatabox * box, + gfloat * left, gfloat * right, + gfloat * top, gfloat * bottom); +void gtk_databox_get_visible_limits (GtkDatabox * box, + gfloat * left, gfloat * right, + gfloat * top, gfloat * bottom); + +void gtk_databox_set_adjustment_x (GtkDatabox * box, GtkAdjustment * adj); +void gtk_databox_set_adjustment_y (GtkDatabox * box, GtkAdjustment * adj); +GtkAdjustment *gtk_databox_get_adjustment_x (GtkDatabox * box); +GtkAdjustment *gtk_databox_get_adjustment_y (GtkDatabox * box); + +void gtk_databox_set_ruler_x (GtkDatabox * box, GtkDataboxRuler * ruler); +void gtk_databox_set_ruler_y (GtkDatabox * box, GtkDataboxRuler * ruler); +GtkDataboxRuler *gtk_databox_get_ruler_x (GtkDatabox * box); +GtkDataboxRuler *gtk_databox_get_ruler_y (GtkDatabox * box); + +void gtk_databox_set_scale_type_x (GtkDatabox * box, + GtkDataboxScaleType scale_type); +void gtk_databox_set_scale_type_y (GtkDatabox * box, + GtkDataboxScaleType scale_type); +GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox * box); +GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox * box); + +void gtk_databox_set_enable_selection (GtkDatabox * box, gboolean enable); +void gtk_databox_set_enable_zoom (GtkDatabox * box, gboolean enable); +void gtk_databox_set_box_shadow(GtkDatabox * box, GtkShadowType which_shadow); + +gboolean gtk_databox_get_enable_selection (GtkDatabox * box); +gboolean gtk_databox_get_enable_zoom (GtkDatabox * box); +GtkShadowType gtk_databox__get_box_shadow(GtkDatabox * box); + +void gtk_databox_zoom_to_selection (GtkDatabox * box); +void gtk_databox_zoom_out (GtkDatabox * box); +void gtk_databox_zoom_home (GtkDatabox * box); + +gint16 gtk_databox_value_to_pixel_x (GtkDatabox * box, gfloat value); +gint16 gtk_databox_value_to_pixel_y (GtkDatabox * box, gfloat value); +gfloat gtk_databox_pixel_to_value_x (GtkDatabox * box, gint16 pixel); +gfloat gtk_databox_pixel_to_value_y (GtkDatabox * box, gint16 pixel); +void gtk_databox_values_to_pixels (GtkDatabox * box, + guint len, + const gfloat * values_x, + const gfloat * values_y, + GdkPoint * pixels); + +void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget ** + p_box, + GtkWidget ** + p_table, + gboolean scrollbar_x, + gboolean scrollbar_y, + gboolean ruler_x, + gboolean ruler_y); + +void +gtk_databox_create_box_with_scrollbars_and_rulers_positioned (GtkWidget ** p_box, + GtkWidget ** p_table, + gboolean scrollbar_x, + gboolean scrollbar_y, + gboolean ruler_x, + gboolean ruler_y, + gboolean ruler_x_top, + gboolean ruler_y_left); - /** - * GtkDataboxPrivate - * - * A private data structure used by the #GtkDatabox. It shields all internal things - * from developers who are just using the widget. - * - **/ - typedef struct _GtkDataboxPrivate GtkDataboxPrivate; - - typedef struct - { - gfloat x1; - gfloat x2; - gfloat y1; - gfloat y2; - } GtkDataboxValueRectangle; - - /** - * _GtkDatabox - * @box: The parent object - * @priv: A private structure containing internal data. - * - * Implementation of #GtkDatabox. - * - **/ - struct _GtkDatabox - { - /*< private >*/ - GtkWidget box; - - GtkDataboxPrivate *priv; - }; - - struct _GtkDataboxClass - { - GtkWidgetClass parent_class; - - void (*zoomed) (GtkDatabox * box); - void (*selection_started) (GtkDatabox * box, - GtkDataboxValueRectangle * selectionValues); - void (*selection_changed) (GtkDatabox * box, - GtkDataboxValueRectangle * selectionValues); - void (*selection_finalized) (GtkDatabox * box, - GtkDataboxValueRectangle * - selectionValues); - void (*selection_canceled) (GtkDatabox * box); - }; - - GType gtk_databox_get_type (void); - - GtkWidget *gtk_databox_new (void); - - gint gtk_databox_graph_add (GtkDatabox * box, GtkDataboxGraph * graph); - gint gtk_databox_graph_remove (GtkDatabox * box, GtkDataboxGraph * graph); - gint gtk_databox_graph_remove_all (GtkDatabox * box); - - gint gtk_databox_auto_rescale (GtkDatabox * box, gfloat border); - gint gtk_databox_calculate_extrema (GtkDatabox * box, - gfloat * min_x, gfloat * max_x, - gfloat * min_y, gfloat * max_y); - - void gtk_databox_set_total_limits (GtkDatabox * box, - gfloat left, gfloat right, - gfloat top, gfloat bottom); - void gtk_databox_set_visible_limits (GtkDatabox * box, - gfloat left, gfloat right, - gfloat top, gfloat bottom); - void gtk_databox_get_total_limits (GtkDatabox * box, - gfloat * left, gfloat * right, - gfloat * top, gfloat * bottom); - void gtk_databox_get_visible_limits (GtkDatabox * box, - gfloat * left, gfloat * right, - gfloat * top, gfloat * bottom); - - void gtk_databox_set_adjustment_x (GtkDatabox * box, GtkAdjustment * adj); - void gtk_databox_set_adjustment_y (GtkDatabox * box, GtkAdjustment * adj); - GtkAdjustment *gtk_databox_get_adjustment_x (GtkDatabox * box); - GtkAdjustment *gtk_databox_get_adjustment_y (GtkDatabox * box); - - void gtk_databox_set_ruler_x (GtkDatabox * box, GtkDataboxRuler * ruler); - void gtk_databox_set_ruler_y (GtkDatabox * box, GtkDataboxRuler * ruler); - GtkDataboxRuler *gtk_databox_get_ruler_x (GtkDatabox * box); - GtkDataboxRuler *gtk_databox_get_ruler_y (GtkDatabox * box); - - void gtk_databox_set_scale_type_x (GtkDatabox * box, - GtkDataboxScaleType scale_type); - void gtk_databox_set_scale_type_y (GtkDatabox * box, - GtkDataboxScaleType scale_type); - GtkDataboxScaleType gtk_databox_get_scale_type_x (GtkDatabox * box); - GtkDataboxScaleType gtk_databox_get_scale_type_y (GtkDatabox * box); - - void gtk_databox_set_enable_selection (GtkDatabox * box, gboolean enable); - void gtk_databox_set_enable_zoom (GtkDatabox * box, gboolean enable); - - gboolean gtk_databox_get_enable_selection (GtkDatabox * box); - gboolean gtk_databox_get_enable_zoom (GtkDatabox * box); - - void gtk_databox_zoom_to_selection (GtkDatabox * box); - void gtk_databox_zoom_out (GtkDatabox * box); - void gtk_databox_zoom_home (GtkDatabox * box); - - gint16 gtk_databox_value_to_pixel_x (GtkDatabox * box, gfloat value); - gint16 gtk_databox_value_to_pixel_y (GtkDatabox * box, gfloat value); - gfloat gtk_databox_pixel_to_value_x (GtkDatabox * box, gint16 pixel); - gfloat gtk_databox_pixel_to_value_y (GtkDatabox * box, gint16 pixel); - void gtk_databox_values_to_pixels (GtkDatabox * box, - guint len, - const gfloat * values_x, - const gfloat * values_y, - GdkPoint * pixels); - - void gtk_databox_create_box_with_scrollbars_and_rulers (GtkWidget ** - p_box, - GtkWidget ** - p_table, - gboolean scrollbar_x, - gboolean scrollbar_y, - gboolean ruler_x, - gboolean ruler_y); - - /* Used by graph objects */ - GdkPixmap* gtk_databox_get_backing_pixmap(GtkDatabox * box); +/* Used by graph objects */ +GdkPixmap* gtk_databox_get_backing_pixmap(GtkDatabox * box); G_END_DECLS #endif /* __GTK_DATABOX_H__ */ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_graph.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_graph.c 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -22,117 +22,117 @@ #include static void gtk_databox_graph_real_draw (GtkDataboxGraph * graph, - GtkDatabox * draw); + GtkDatabox * draw); static gint gtk_databox_graph_real_calculate_extrema (GtkDataboxGraph * graph, - gfloat * min_x, - gfloat * max_x, - gfloat * min_y, - gfloat * max_y); + gfloat * min_x, + gfloat * max_x, + gfloat * min_y, + gfloat * max_y); static GdkGC * gtk_databox_graph_real_create_gc (GtkDataboxGraph * graph, - GtkDatabox * box); + GtkDatabox * box); /* IDs of properties */ enum { - GRAPH_COLOR = 1, - GRAPH_SIZE, - GRAPH_HIDE + GRAPH_COLOR = 1, + GRAPH_SIZE, + GRAPH_HIDE }; struct _GtkDataboxGraphPrivate { - GdkColor color; - gint size; - gboolean hide; - GdkGC *gc; + GdkColor color; + gint size; + gboolean hide; + GdkGC *gc; }; static gpointer parent_class = NULL; static void gtk_databox_graph_set_property (GObject * object, - guint property_id, - const GValue * value, GParamSpec * pspec) + guint property_id, + const GValue * value, GParamSpec * pspec) { - GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (object); + GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (object); - switch (property_id) - { - case GRAPH_COLOR: - { - gtk_databox_graph_set_color (graph, - (GdkColor *) - g_value_get_pointer (value)); - } - break; - case GRAPH_SIZE: - { - gtk_databox_graph_set_size (graph, g_value_get_int (value)); - } - break; - case GRAPH_HIDE: - { - gtk_databox_graph_set_hide (graph, g_value_get_boolean (value)); - } - break; - default: + switch (property_id) + { + case GRAPH_COLOR: + { + gtk_databox_graph_set_color (graph, + (GdkColor *) + g_value_get_pointer (value)); + } + break; + case GRAPH_SIZE: + { + gtk_databox_graph_set_size (graph, g_value_get_int (value)); + } + break; + case GRAPH_HIDE: + { + gtk_databox_graph_set_hide (graph, g_value_get_boolean (value)); + } + break; + default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; - } + } } static void gtk_databox_graph_get_property (GObject * object, - guint property_id, - GValue * value, GParamSpec * pspec) + guint property_id, + GValue * value, GParamSpec * pspec) { - GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (object); + GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (object); - switch (property_id) - { - case GRAPH_COLOR: - { - g_value_set_pointer (value, gtk_databox_graph_get_color (graph)); - } - break; - case GRAPH_SIZE: - { - g_value_set_int (value, gtk_databox_graph_get_size (graph)); - } - break; - case GRAPH_HIDE: - { - g_value_set_boolean (value, gtk_databox_graph_get_hide (graph)); - } - break; - default: + switch (property_id) + { + case GRAPH_COLOR: + { + g_value_set_pointer (value, gtk_databox_graph_get_color (graph)); + } + break; + case GRAPH_SIZE: + { + g_value_set_int (value, gtk_databox_graph_get_size (graph)); + } + break; + case GRAPH_HIDE: + { + g_value_set_boolean (value, gtk_databox_graph_get_hide (graph)); + } + break; + default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; - } + } } static void gtk_databox_graph_delete_gc (GtkDataboxGraph * graph) { - if (graph->priv->gc) - { + if (graph->priv->gc) + { GdkColormap *colormap = NULL; colormap = gdk_gc_get_colormap (graph->priv->gc); gdk_colormap_free_colors (colormap, &graph->priv->color, 1); gtk_gc_release (graph->priv->gc); graph->priv->gc = NULL; - } + } } -/** +/** * gtk_databox_graph_create_gc: * @graph: A #GtkDataboxGraph object * @box: A #GtkDatabox object * - * Virtual function which creates a graphics context for the @graph. + * Virtual function which creates a graphics context for the @graph. * * Typically called by derived graph objects when the graphics context is needed for the first time. * @@ -140,141 +140,142 @@ */ GdkGC* gtk_databox_graph_create_gc (GtkDataboxGraph * graph, - GtkDatabox* box) + GtkDatabox* box) { - return GTK_DATABOX_GRAPH_GET_CLASS (graph)->create_gc (graph, box); + return GTK_DATABOX_GRAPH_GET_CLASS (graph)->create_gc (graph, box); } static GdkGC* gtk_databox_graph_real_create_gc (GtkDataboxGraph * graph, - GtkDatabox* box) + GtkDatabox* box) { - GtkWidget *widget = GTK_WIDGET(box); - GdkGCValues values; - GdkGCValuesMask valuesMask; - GdkColormap *colormap = NULL; - GtkStyle *style; - - g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), NULL); - - if (graph->priv->gc) - gtk_databox_graph_delete_gc (graph); - - style = widget->style; - - colormap = style->colormap; - g_return_val_if_fail (colormap, NULL); - g_return_val_if_fail (gdk_colormap_alloc_color (colormap, - &graph->priv->color, - FALSE, TRUE), NULL); - - valuesMask = GDK_GC_FOREGROUND | GDK_GC_BACKGROUND - | GDK_GC_FUNCTION - | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE - | GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE; - - values.foreground = graph->priv->color; - values.background = style->black; - values.function = GDK_COPY; - /* I am not sure, why line_width==1 is so much slower than 0, but - * it is (at least for my machine with gtk+-2.4) */ - values.line_width = (graph->priv->size > 1) ? graph->priv->size : 0; - values.line_style = GDK_LINE_SOLID; - values.cap_style = GDK_CAP_BUTT; - values.join_style = GDK_JOIN_MITER; + GtkWidget *widget = GTK_WIDGET(box); + GdkGCValues values; + GdkGCValuesMask valuesMask; + GdkColormap *colormap = NULL; + GtkStyle *style; + + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), NULL); + + if (graph->priv->gc) + gtk_databox_graph_delete_gc (graph); + + style = widget->style; + + colormap = style->colormap; + g_return_val_if_fail (colormap, NULL); + g_return_val_if_fail (gdk_colormap_alloc_color (colormap, + &graph->priv->color, + FALSE, TRUE), NULL); + + valuesMask = GDK_GC_FOREGROUND | GDK_GC_BACKGROUND + | GDK_GC_FUNCTION + | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE + | GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE; + + values.foreground = graph->priv->color; + values.background = style->black; + values.function = GDK_COPY; + /* I am not sure, why line_width==1 is so much slower than 0, but + * it is (at least for my machine with gtk+-2.4) */ + values.line_width = (graph->priv->size > 1) ? graph->priv->size : 0; + values.line_style = GDK_LINE_SOLID; + values.cap_style = GDK_CAP_BUTT; + values.join_style = GDK_JOIN_MITER; - graph->priv->gc = gtk_gc_get (style->depth, - style->colormap, &values, valuesMask); + graph->priv->gc = gtk_gc_get (style->depth, + style->colormap, &values, valuesMask); - return graph->priv->gc; + return graph->priv->gc; } static void graph_finalize (GObject * object) { - GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (object); + GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (object); - gtk_databox_graph_delete_gc (graph); - g_free (graph->priv); + gtk_databox_graph_delete_gc (graph); + g_free (graph->priv); - /* Chain up to the parent class */ - G_OBJECT_CLASS (parent_class)->finalize (object); + /* Chain up to the parent class */ + G_OBJECT_CLASS (parent_class)->finalize (object); } static void gtk_databox_graph_class_init (gpointer g_class /*, gpointer g_class_data */ ) { - GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); - GtkDataboxGraphClass *klass = GTK_DATABOX_GRAPH_CLASS (g_class); - GParamSpec *graph_param_spec; + GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); + GtkDataboxGraphClass *klass = GTK_DATABOX_GRAPH_CLASS (g_class); + GParamSpec *graph_param_spec; - parent_class = g_type_class_peek_parent (klass); + parent_class = g_type_class_peek_parent (klass); - gobject_class->set_property = gtk_databox_graph_set_property; - gobject_class->get_property = gtk_databox_graph_get_property; - gobject_class->finalize = graph_finalize; + gobject_class->set_property = gtk_databox_graph_set_property; + gobject_class->get_property = gtk_databox_graph_get_property; + gobject_class->finalize = graph_finalize; - graph_param_spec = g_param_spec_pointer ("color", - "Graph color", - "Color of graph", - G_PARAM_READWRITE); + graph_param_spec = g_param_spec_pointer ("color", + "Graph color", + "Color of graph", + G_PARAM_READWRITE); - g_object_class_install_property (gobject_class, - GRAPH_COLOR, graph_param_spec); + g_object_class_install_property (gobject_class, + GRAPH_COLOR, graph_param_spec); - graph_param_spec = g_param_spec_int ("size", "Graph size", "Size of displayed items", G_MININT, G_MAXINT, 0, /* default value */ - G_PARAM_READWRITE); + graph_param_spec = g_param_spec_int ("size", "Graph size", "Size of displayed items", G_MININT, G_MAXINT, 0, /* default value */ + G_PARAM_READWRITE); - g_object_class_install_property (gobject_class, - GRAPH_SIZE, graph_param_spec); + g_object_class_install_property (gobject_class, + GRAPH_SIZE, graph_param_spec); - graph_param_spec = g_param_spec_boolean ("hide", "Graph hidden", "Determine if graph is hidden or not", FALSE, /* default value */ - G_PARAM_READWRITE); + graph_param_spec = g_param_spec_boolean ("hide", "Graph hidden", "Determine if graph is hidden or not", FALSE, /* default value */ + G_PARAM_READWRITE); - g_object_class_install_property (gobject_class, - GRAPH_SIZE, graph_param_spec); + g_object_class_install_property (gobject_class, + GRAPH_HIDE, graph_param_spec); - klass->draw = gtk_databox_graph_real_draw; - klass->calculate_extrema = gtk_databox_graph_real_calculate_extrema; - klass->create_gc = gtk_databox_graph_real_create_gc; + klass->draw = gtk_databox_graph_real_draw; + klass->calculate_extrema = gtk_databox_graph_real_calculate_extrema; + klass->create_gc = gtk_databox_graph_real_create_gc; } static void gtk_databox_graph_instance_init (GTypeInstance * instance - /*, gpointer g_class */ ) + /*, gpointer g_class */ ) { - GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (instance); + GtkDataboxGraph *graph = GTK_DATABOX_GRAPH (instance); - graph->priv = g_new0 (GtkDataboxGraphPrivate, 1); + graph->priv = g_new0 (GtkDataboxGraphPrivate, 1); } GType gtk_databox_graph_get_type (void) { - static GType type = 0; + static GType type = 0; - if (type == 0) - { - static const GTypeInfo info = { - sizeof (GtkDataboxGraphClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_databox_graph_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkDataboxGraph), /* instance_size */ - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_databox_graph_instance_init, /* instance_init */ - NULL, /* value_table */ + if (type == 0) + { + static const GTypeInfo info = + { + sizeof (GtkDataboxGraphClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_databox_graph_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkDataboxGraph), /* instance_size */ + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_databox_graph_instance_init, /* instance_init */ + NULL, /* value_table */ }; type = g_type_register_static (G_TYPE_OBJECT, - "GtkDataboxGraph", &info, 0); - } + "GtkDataboxGraph", &info, 0); + } - return type; + return type; } -/** +/** * gtk_databox_graph_draw: * @graph: A #GtkDataboxGraph object * @box: A #GtkDatabox object @@ -287,11 +288,11 @@ void gtk_databox_graph_draw (GtkDataboxGraph * graph, GtkDatabox* box) { - if (!graph->priv->hide) - GTK_DATABOX_GRAPH_GET_CLASS (graph)->draw (graph, box); + if (!graph->priv->hide) + GTK_DATABOX_GRAPH_GET_CLASS (graph)->draw (graph, box); } -/** +/** * gtk_databox_graph_calculate_extrema: * @graph: A #GtkDataboxGraph object * @min_x: Will be filled with the lowest x value of the dataset @@ -299,9 +300,9 @@ * @min_y: Will be filled with the lowest y value of the dataset * @max_y: Will be filled with the highest y value of the dataset * - * Virtual function which determines the minimum and maximum x and y values of the values of this - * #GtkDataboxGraph object if applicable (there are graphs which do - * not contain data). + * Virtual function which determines the minimum and maximum x and y values of the values of this + * #GtkDataboxGraph object if applicable (there are graphs which do + * not contain data). * * Return value: 0 on success, * -1 if no data is available, @@ -309,193 +310,193 @@ */ gint gtk_databox_graph_calculate_extrema (GtkDataboxGraph * graph, - gfloat * min_x, gfloat * max_x, - gfloat * min_y, gfloat * max_y) + gfloat * min_x, gfloat * max_x, + gfloat * min_y, gfloat * max_y) { - return - GTK_DATABOX_GRAPH_GET_CLASS (graph)->calculate_extrema (graph, min_x, - max_x, min_y, - max_y); + return + GTK_DATABOX_GRAPH_GET_CLASS (graph)->calculate_extrema (graph, min_x, + max_x, min_y, + max_y); } static void gtk_databox_graph_real_draw (GtkDataboxGraph * graph, - GtkDatabox* box) + GtkDatabox* box) { - g_return_if_fail (graph); - g_return_if_fail (box); + g_return_if_fail (graph); + g_return_if_fail (box); - /* We have no data... */ - return; + /* We have no data... */ + return; } static gint gtk_databox_graph_real_calculate_extrema (GtkDataboxGraph * graph, - gfloat * min_x, gfloat * max_x, - gfloat * min_y, gfloat * max_y) + gfloat * min_x, gfloat * max_x, + gfloat * min_y, gfloat * max_y) { - g_return_val_if_fail (graph, -1); - g_return_val_if_fail (min_x, -1); - g_return_val_if_fail (max_x, -1); - g_return_val_if_fail (min_y, -1); - g_return_val_if_fail (max_y, -1); + g_return_val_if_fail (graph, -1); + g_return_val_if_fail (min_x, -1); + g_return_val_if_fail (max_x, -1); + g_return_val_if_fail (min_y, -1); + g_return_val_if_fail (max_y, -1); - /* We have no data... */ - return -1; + /* We have no data... */ + return -1; } -/** +/** * gtk_databox_graph_set_color: * @graph: A #GtkDataboxGraph object * @color: Color which is to be used by the graph object * * Sets the color which the #GtkDataboxGraph object is supposed to be using when drawing itself. - * + * */ void gtk_databox_graph_set_color (GtkDataboxGraph * graph, GdkColor * color) { - GdkColormap *colormap = NULL; + GdkColormap *colormap = NULL; - g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); + g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); - if (graph->priv->gc) - { + if (graph->priv->gc) + { colormap = gdk_gc_get_colormap (graph->priv->gc); gdk_colormap_free_colors (colormap, &graph->priv->color, 1); gdk_colormap_alloc_color (colormap, color, FALSE, TRUE); gdk_gc_set_foreground (graph->priv->gc, color); - } + } - graph->priv->color = *color; + graph->priv->color = *color; - g_object_notify (G_OBJECT (graph), "color"); + g_object_notify (G_OBJECT (graph), "color"); } -/** +/** * gtk_databox_graph_get_color: * @graph: A #GtkDataboxGraph object * * Gets the current color of the graph elements (e.g. points). * * Return value: The color of the graph. - * + * */ GdkColor * gtk_databox_graph_get_color (GtkDataboxGraph * graph) { - return &graph->priv->color; + return &graph->priv->color; } -/** +/** * gtk_databox_graph_set_size: * @graph: A #GtkDataboxGraph object * @size: Size of graph elements for the graph object * * Sets the size (e.g. line width) which the #GtkDataboxGraph object is supposed to be using when drawing itself. - * + * */ void gtk_databox_graph_set_size (GtkDataboxGraph * graph, gint size) { - GdkGCValues values; + GdkGCValues values; - g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); + g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); - graph->priv->size = MAX (1, size);; + graph->priv->size = MAX (1, size);; - if (graph->priv->gc) - { + if (graph->priv->gc) + { values.line_width = graph->priv->size; gdk_gc_set_values (graph->priv->gc, &values, GDK_GC_LINE_WIDTH); - } + } - g_object_notify (G_OBJECT (graph), "size"); + g_object_notify (G_OBJECT (graph), "size"); } -/** +/** * gtk_databox_graph_get_size: * @graph: A #GtkDataboxGraph object * * Gets the size of the graph elements (e.g. the line width). * * Return value: size of the graph elements - * + * */ gint gtk_databox_graph_get_size (GtkDataboxGraph * graph) { - g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); - return graph->priv->size; + return graph->priv->size; } -/** +/** * gtk_databox_graph_set_gc: * @graph: A #GtkDataboxGraph object * @gc: Graphics contex for the graph object * * Sets the graphics context which the #GtkDataboxGraph object is supposed to be using when drawing itself. - * + * */ -void +void gtk_databox_graph_set_gc (GtkDataboxGraph * graph, GdkGC *gc) { - g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); - g_return_if_fail (GDK_IS_GC (gc)); + g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); + g_return_if_fail (GDK_IS_GC (gc)); - graph->priv->gc = gc; + graph->priv->gc = gc; } -/** +/** * gtk_databox_graph_get_gc: * @graph: A #GtkDataboxGraph object * * Gets the current graphics context of the graph. * * Return value: The current graphics context of the graph. - * + * */ -GdkGC* +GdkGC* gtk_databox_graph_get_gc (GtkDataboxGraph * graph) { - g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), NULL); + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), NULL); - return graph->priv->gc; + return graph->priv->gc; } -/** +/** * gtk_databox_graph_set_hide: * @graph: A #GtkDataboxGraph object * @hide: Declares whether should be hidden (true) or not (false). * * Hidden graphs are not shown, when the #GtkDatabox containing them is redrawn. - * + * */ void gtk_databox_graph_set_hide (GtkDataboxGraph * graph, gboolean hide) { - g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); + g_return_if_fail (GTK_DATABOX_IS_GRAPH (graph)); - graph->priv->hide = hide; + graph->priv->hide = hide; - g_object_notify (G_OBJECT (graph), "hide"); + g_object_notify (G_OBJECT (graph), "hide"); } -/** +/** * gtk_databox_graph_get_hide: * @graph: A #GtkDataboxGraph object * * Gets the current "hide" status. * * Return value: Whether the graph is hidden (true) or not (false). - * + * */ gboolean gtk_databox_graph_get_hide (GtkDataboxGraph * graph) { - g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); + g_return_val_if_fail (GTK_DATABOX_IS_GRAPH (graph), -1); - return graph->priv->hide; + return graph->priv->hide; } diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_grid.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.c 2009-04-19 13:16:07.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_grid.c 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -23,20 +23,22 @@ GtkDatabox* box); static GdkGC* gtk_databox_grid_real_create_gc (GtkDataboxGraph * graph, GtkDatabox* box); -static gfloat *hline_vals=NULL; -static gfloat *vline_vals=NULL; /* IDs of properties */ enum { GRID_HLINES = 1, - GRID_VLINES + GRID_VLINES, + GRID_HLINE_VALS, + GRID_VLINE_VALS }; struct _GtkDataboxGridPrivate { gint hlines; gint vlines; + gfloat *hline_vals; + gfloat *vline_vals; }; static gpointer parent_class = NULL; @@ -60,6 +62,16 @@ gtk_databox_grid_set_vlines (grid, g_value_get_int (value)); } break; + case GRID_HLINE_VALS: + { + gtk_databox_grid_set_hline_vals (grid, (gfloat *) g_value_get_pointer (value)); + } + break; + case GRID_VLINE_VALS: + { + gtk_databox_grid_set_vline_vals (grid, (gfloat *) g_value_get_pointer (value)); + } + break; default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -86,6 +98,16 @@ g_value_set_int (value, gtk_databox_grid_get_vlines (grid)); } break; + case GRID_HLINE_VALS: + { + g_value_set_pointer (value, gtk_databox_grid_get_hline_vals (grid)); + } + break; + case GRID_VLINE_VALS: + { + g_value_set_pointer (value, gtk_databox_grid_get_vline_vals (grid)); + } + break; default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -154,6 +176,16 @@ g_object_class_install_property (gobject_class, GRID_VLINES, grid_param_spec); + grid_param_spec = g_param_spec_pointer ("grid-hline-vals", "Grid Hline Vals", "The locations of each of the horizontal lines", G_PARAM_READWRITE); + + g_object_class_install_property (gobject_class, + GRID_HLINE_VALS, grid_param_spec); + + grid_param_spec = g_param_spec_pointer ("grid-vline-vals", "Grid Vline Vals", "The locations of each of the vertical lines", G_PARAM_READWRITE); + + g_object_class_install_property (gobject_class, + GRID_VLINE_VALS, grid_param_spec); + graph_class->draw = gtk_databox_grid_real_draw; graph_class->create_gc = gtk_databox_grid_real_create_gc; } @@ -208,11 +240,10 @@ gtk_databox_grid_new (gint hlines, gint vlines, GdkColor * color, guint size) { GtkDataboxGrid *grid; - grid = g_object_new (GTK_DATABOX_TYPE_GRID, "color", color, "size", size, - "grid-hlines", hlines, "grid-vlines", vlines, NULL); + "grid-hlines", hlines, "grid-vlines", vlines, "grid-hline-vals",NULL, "grid-vline-vals", NULL, NULL); return GTK_DATABOX_GRAPH (grid); } @@ -238,10 +269,7 @@ grid = g_object_new (GTK_DATABOX_TYPE_GRID, "color", color, "size", size, - "grid-hlines", hlines, "grid-vlines", vlines, "grid-hline-vals", NULL); - //"grid-hlines", hlines, "grid-vlines", vlines, "grid-hline-vals", hline_vals, "grid-vline-vals", vline_vals, NULL); - hline_vals = local_hline_vals; - vline_vals = local_vline_vals; + "grid-hlines", hlines, "grid-vlines", vlines, "grid-hline-vals", local_hline_vals, "grid-vline-vals", local_vline_vals, NULL); return GTK_DATABOX_GRAPH (grid); } @@ -290,7 +318,7 @@ factor_y = (bottom - top) / (grid->priv->hlines + 1); - if (hline_vals == NULL) + if (grid->priv->hline_vals == NULL) for (i = 0; i < grid->priv->hlines; i++) { y = offset_y + (i + 1) * factor_y; @@ -300,12 +328,12 @@ else for (i = 0; i < grid->priv->hlines; i++) { - y = hline_vals[i]; + y = grid->priv->hline_vals[i]; pixel_y = gtk_databox_value_to_pixel_y (box, y); gdk_draw_line (pixmap, gc, 0, pixel_y, width, pixel_y); } - if (vline_vals == NULL) + if (grid->priv->vline_vals == NULL) for (i = 0; i < grid->priv->vlines; i++) { x = offset_x + (i + 1) * factor_x; @@ -315,7 +343,7 @@ else for (i = 0; i < grid->priv->vlines; i++) { - x = vline_vals[i]; + x = grid->priv->vline_vals[i]; pixel_x = gtk_databox_value_to_pixel_x (box, x); gdk_draw_line (pixmap, gc, pixel_x, 0, pixel_x, height); } @@ -389,3 +417,69 @@ return grid->priv->vlines; } + +/** + * gtk_databox_grid_set_hline_vals: + * @grid: a #GtkDataboxGrid graph object + * @hline_vals: sets the pointer to the hline values for the grid + * + * Sets the pointer to the horizontal lines in the @grid. + **/ +void +gtk_databox_grid_set_hline_vals (GtkDataboxGrid * grid, gfloat *hline_vals) +{ + g_return_if_fail (GTK_DATABOX_IS_GRID (grid)); + + grid->priv->hline_vals = hline_vals; + + g_object_notify (G_OBJECT (grid), "grid-hline-vals"); +} + +/** + * gtk_databox_grid_get_hline_vals: + * @grid: a #GtkDataboxGrid graph object + * + * Gets the pointer to the horizontal line values for the @grid. + * + * Return value: Pointer to the horizontal line values for the @grid. + **/ +gfloat* +gtk_databox_grid_get_hline_vals (GtkDataboxGrid * grid) +{ + g_return_val_if_fail (GTK_DATABOX_IS_GRID (grid), -1); + + return grid->priv->hline_vals; +} + +/** + * gtk_databox_grid_set_vline_vals: + * @grid: a #GtkDataboxGrid graph object + * @vline_vals: sets the pointer to the vline values for the grid + * + * Sets the pointer to the vertical lines in the @grid. + **/ +void +gtk_databox_grid_set_vline_vals (GtkDataboxGrid * grid, gfloat *vline_vals) +{ + g_return_if_fail (GTK_DATABOX_IS_GRID (grid)); + + grid->priv->vline_vals = vline_vals; + + g_object_notify (G_OBJECT (grid), "grid-vline-vals"); +} + +/** + * gtk_databox_grid_get_vline_vals: + * @grid: a #GtkDataboxGrid graph object + * + * Gets the pointer to the vertical line values for the @grid. + * + * Return value: Pointer to the vertical line values for the @grid. + **/ +gfloat* +gtk_databox_grid_get_vline_vals (GtkDataboxGrid * grid) +{ + g_return_val_if_fail (GTK_DATABOX_IS_GRID (grid), -1); + + return grid->priv->vline_vals; +} diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.h libgtkdatabox-0.9.2.0/gtk/gtkdatabox_grid.h --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.h 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_grid.h 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -23,7 +23,7 @@ * @include: gtkdatabox_grid.h * @see_also: #GtkDatabox, #GtkDataboxGraph, #GtkDataboxPoints, #GtkDataboxLines, #GtkDataboxBars, #GtkDataboxMarkers * - * #GtkDataboxGrid is a #GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine + * #GtkDataboxGrid is a #GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine * the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data. * */ @@ -52,7 +52,7 @@ /** * GtkDataboxGrid * - * #GtkDataboxGrid is a #GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine + * #GtkDataboxGrid is a #GtkDataboxGraph class for displaying a grid (like in an oscilloscope). You can determine * the number of horizontal and vertical lines. When you zoom in, the grid is also zoomed along with the data. * */ @@ -65,7 +65,7 @@ * GtkDataboxGridPrivate * * A private data structure used by the #GtkDataboxGrid. It shields all internal things - * from developers who are just using the object. + * from developers who are just using the object. * **/ typedef struct _GtkDataboxGridPrivate GtkDataboxGridPrivate; @@ -95,5 +95,11 @@ void gtk_databox_grid_set_vlines (GtkDataboxGrid * grid, gint vlines); gint gtk_databox_grid_get_vlines (GtkDataboxGrid * grid); + void gtk_databox_grid_set_hline_vals (GtkDataboxGrid * grid, gfloat* hline_vals); + gfloat* gtk_databox_grid_get_hline_vals (GtkDataboxGrid * grid); + + void gtk_databox_grid_set_vline_vals (GtkDataboxGrid * grid, gfloat* vline_vals); + gfloat* gtk_databox_grid_get_vline_vals (GtkDataboxGrid * grid); + G_END_DECLS #endif /* __GTK_DATABOX_GRID_H__ */ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_offset_bars.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_offset_bars.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_offset_bars.c 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_offset_bars.c 2012-10-03 19:28:52.000000000 +0000 @@ -0,0 +1,186 @@ +/* $Id: gtkdatabox_offset_bars.c 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 2011 - 2012 Dr. Matt Flax + * + * This program 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 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 Lesser 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. + */ + +#include + +static void gtk_databox_offset_bars_real_draw (GtkDataboxGraph * bars, + GtkDatabox* box); + +struct _GtkDataboxOffsetBarsPrivate +{ + GdkSegment *data; +}; + +static gpointer parent_class = NULL; + +static void +bars_finalize (GObject * object) +{ + GtkDataboxOffsetBars *bars = GTK_DATABOX_OFFSET_BARS (object); + + g_free (bars->priv->data); + g_free (bars->priv); + + /* Chain up to the parent class */ + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +gtk_databox_offset_bars_class_init (gpointer g_class /*, gpointer g_class_data */ ) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); + GtkDataboxGraphClass *graph_class = GTK_DATABOX_GRAPH_CLASS (g_class); + GtkDataboxOffsetBarsClass *klass = GTK_DATABOX_OFFSET_BARS_CLASS (g_class); + + parent_class = g_type_class_peek_parent (klass); + + gobject_class->finalize = bars_finalize; + + graph_class->draw = gtk_databox_offset_bars_real_draw; +} + +static void +gtk_databox_offset_bars_complete (GtkDataboxOffsetBars * bars) +{ + bars->priv->data = + g_new0 (GdkSegment, + gtk_databox_xyyc_graph_get_length + (GTK_DATABOX_XYYC_GRAPH (bars))); + +} + +static void +gtk_databox_offset_bars_instance_init (GTypeInstance * instance) +{ + GtkDataboxOffsetBars *bars = GTK_DATABOX_OFFSET_BARS (instance); + + bars->priv = g_new0 (GtkDataboxOffsetBarsPrivate, 1); + + g_signal_connect (bars, "notify::length", + G_CALLBACK (gtk_databox_offset_bars_complete), NULL); +} + +GType +gtk_databox_offset_bars_get_type (void) +{ + static GType type = 0; + + if (type == 0) + { + static const GTypeInfo info = { + sizeof (GtkDataboxOffsetBarsClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_databox_offset_bars_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkDataboxOffsetBars), /* instance_size */ + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_databox_offset_bars_instance_init, /* instance_init */ + NULL, /* value_table */ + }; + type = g_type_register_static (GTK_DATABOX_TYPE_XYYC_GRAPH, + "GtkDataboxOffsetBars", &info, 0); + } + + return type; +} + +/** + * gtk_databox_offset_bars_new: + * @len: length of @X, @Y1 and @Y2 + * @X: array of horizontal position values of markers + * @Y1: array of starting vertical position values of markers + * @Y2: array of ending vertical position values of markers + * @color: color of the markers + * @size: marker size or line width (depending on the @type) + * + * Creates a new #GtkDataboxOffsetBars object which can be added to a #GtkDatabox widget + * + * Return value: A new #GtkDataboxOffsetBars object + **/ +GtkDataboxGraph * +gtk_databox_offset_bars_new (guint len, gfloat * X, gfloat * Y1, gfloat * Y2, + GdkColor * color, guint size) +{ + GtkDataboxOffsetBars *bars; + g_return_val_if_fail (X, NULL); + g_return_val_if_fail (Y1, NULL); + g_return_val_if_fail (Y2, NULL); + g_return_val_if_fail ((len > 0), NULL); + + bars = g_object_new (GTK_DATABOX_TYPE_OFFSET_BARS, + "X-Values", X, + "Y1-Values", Y1, + "Y2-Values", Y2, + "length", len, "color", color, "size", size, NULL); + + return GTK_DATABOX_GRAPH (bars); +} + +static void +gtk_databox_offset_bars_real_draw (GtkDataboxGraph * graph, + GtkDatabox* box) +{ + GtkDataboxOffsetBars *bars = GTK_DATABOX_OFFSET_BARS (graph); + GdkSegment *data; + GdkGC *gc; + GdkPixmap *pixmap; + guint i = 0; + gfloat *X; + gfloat *Y1; + gfloat *Y2; + guint len; + + g_return_if_fail (GTK_DATABOX_IS_OFFSET_BARS (bars)); + g_return_if_fail (GTK_IS_DATABOX (box)); + + pixmap = gtk_databox_get_backing_pixmap (box); + + if (gtk_databox_get_scale_type_y (box) == GTK_DATABOX_SCALE_LOG) + g_warning + ("gtk_databox_offset_bars do not work well with logarithmic scale in Y axis"); + + if (!(gc = gtk_databox_graph_get_gc(graph))) + gc = gtk_databox_graph_create_gc (graph, box); + + len = gtk_databox_xyyc_graph_get_length (GTK_DATABOX_XYYC_GRAPH (graph)); + X = gtk_databox_xyyc_graph_get_X (GTK_DATABOX_XYYC_GRAPH (graph)); + Y1 = gtk_databox_xyyc_graph_get_Y1 (GTK_DATABOX_XYYC_GRAPH (graph)); + Y2 = gtk_databox_xyyc_graph_get_Y2 (GTK_DATABOX_XYYC_GRAPH (graph)); + + data = bars->priv->data; + + for (i = 0; i < len; i++, data++, X++, Y1++, Y2++) + { + data->x1 = data->x2 = gtk_databox_value_to_pixel_x (box, *X); + data->y1 = gtk_databox_value_to_pixel_y (box, *Y1); + data->y2 = gtk_databox_value_to_pixel_y (box, *Y2); + } + + /* More than 2^16 bars will cause X IO error on most XServers + (Hint from Paul Barton-Davis) */ + for (i = 0; i < len; i += 65536) + { + gdk_draw_segments (pixmap, gc, + bars->priv->data + i, MIN (65536, len - i)); + } + + return; +} diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_offset_bars.h libgtkdatabox-0.9.2.0/gtk/gtkdatabox_offset_bars.h --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_offset_bars.h 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_offset_bars.h 2012-11-09 04:01:48.000000000 +0000 @@ -0,0 +1,90 @@ +/* $Id: gtkdatabox_offset_bars.h 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 1998 - 2008 Dr. Roland Bock + * + * This program 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 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 Lesser 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. + */ + +/** + * SECTION:gtkdatabox_offset_bars + * @short_description: A #GtkDataboxGraph used for displaying xyy-values (x, y1 and y2 values) as vertical bars from y1 to y2. + * @include: gtkdatabox_offset_bars.h + * @see_also: #GtkDatabox, #GtkDataboxGraph, #GtkDataboxPoints, #GtkDataboxLines, #GtkDataboxMarkers, #GtkDataboxOffsetBars + * + * #GtkDataboxOffsetBars is a #GtkDataboxGraph class for displaying xy-values as vertical bars which rise/drop from y1 to y2. + * + */ + +#ifndef __GTK_DATABOX_OFFSET_BARS_H__ +#define __GTK_DATABOX_OFFSET_BARS_H__ + +#include + +G_BEGIN_DECLS +#define GTK_DATABOX_TYPE_OFFSET_BARS (gtk_databox_offset_bars_get_type ()) +#define GTK_DATABOX_OFFSET_BARS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + GTK_DATABOX_TYPE_OFFSET_BARS, \ + GtkDataboxOffsetBars)) +#define GTK_DATABOX_OFFSET_BARS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + GTK_DATABOX_TYPE_OFFSET_BARS, \ + GtkDataboxOffsetBarsClass)) +#define GTK_DATABOX_IS_OFFSET_BARS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + GTK_DATABOX_TYPE_OFFSET_BARS)) +#define GTK_DATABOX_IS_OFFSET_BARS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + GTK_DATABOX_TYPE_OFFSET_BARS)) +#define GTK_DATABOX_OFFSET_BARS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + GTK_DATABOX_TYPE_OFFSET_BARS, \ + GtkDataboxOffsetBarsClass)) + +/** + * GtkDataboxOffsetBars: + * @see_also: #GtkDatabox, #GtkDataboxGraph, #GtkDataboxPoints, #GtkDataboxLines, #GtkDataboxMarkers, #GtkDataboxBars + * + * #GtkDataboxOffsetBars is a #GtkDataboxGraph class for displaying xyy-values as vertical bars which rise/drop from y1. + * + */ + typedef struct _GtkDataboxOffsetBars GtkDataboxOffsetBars; + + typedef struct _GtkDataboxOffsetBarsClass GtkDataboxOffsetBarsClass; + + /** + * GtkDataboxOffsetBarsPrivate + * + * A private data structure used by the #GtkDataboxOffsetBars. It shields all internal things + * from developers who are just using the object. + * + **/ + typedef struct _GtkDataboxOffsetBarsPrivate GtkDataboxOffsetBarsPrivate; + + struct _GtkDataboxOffsetBars + { + /*< private >*/ + GtkDataboxXYYCGraph parent; + + GtkDataboxOffsetBarsPrivate *priv; + }; + + struct _GtkDataboxOffsetBarsClass + { + GtkDataboxXYYCGraphClass parent_class; + }; + + GType gtk_databox_offset_bars_get_type (void); + + GtkDataboxGraph *gtk_databox_offset_bars_new (guint len, gfloat * X, gfloat * Y1, gfloat * Y2, + GdkColor * color, guint size); + +G_END_DECLS +#endif /* __GTK_DATABOX_OFFSET_BARS_H__ */ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_regions.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_regions.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_regions.c 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_regions.c 2012-10-03 19:28:52.000000000 +0000 @@ -0,0 +1,186 @@ +/* $Id: gtkdatabox_regions.c 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 2011 - 2012 Dr. Matt Flax + * + * This program 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 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 Lesser 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. + */ + +#include + +static void gtk_databox_regions_real_draw (GtkDataboxGraph * regions, + GtkDatabox* box); + +struct _GtkDataboxRegionsPrivate +{ + GdkPoint *data; +}; + +static gpointer parent_class = NULL; + +static void +regions_finalize (GObject * object) +{ + GtkDataboxRegions *regions = GTK_DATABOX_REGIONS (object); + + g_free (regions->priv->data); + g_free (regions->priv); + + /* Chain up to the parent class */ + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +gtk_databox_regions_class_init (gpointer g_class /*, gpointer g_class_data */ ) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); + GtkDataboxGraphClass *graph_class = GTK_DATABOX_GRAPH_CLASS (g_class); + GtkDataboxRegionsClass *klass = GTK_DATABOX_REGIONS_CLASS (g_class); + + parent_class = g_type_class_peek_parent (klass); + + gobject_class->finalize = regions_finalize; + + graph_class->draw = gtk_databox_regions_real_draw; +} + +static void +gtk_databox_regions_complete (GtkDataboxRegions * regions) +{ + regions->priv->data = g_new0 (GdkPoint, 4); +} + +static void +gtk_databox_regions_instance_init (GTypeInstance * instance) +{ + GtkDataboxRegions *regions = GTK_DATABOX_REGIONS (instance); + + regions->priv = g_new0 (GtkDataboxRegionsPrivate, 1); + + g_signal_connect (regions, "notify::length", + G_CALLBACK (gtk_databox_regions_complete), NULL); +} + +GType +gtk_databox_regions_get_type (void) +{ + static GType type = 0; + + if (type == 0) + { + static const GTypeInfo info = { + sizeof (GtkDataboxRegionsClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_databox_regions_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkDataboxRegions), /* instance_size */ + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_databox_regions_instance_init, /* instance_init */ + NULL, /* value_table */ + }; + type = g_type_register_static (GTK_DATABOX_TYPE_XYYC_GRAPH, + "GtkDataboxRegions", &info, (GTypeFlags)0); + } + + return type; +} + +/** + * gtk_databox_regions_new: + * @len: length of @X, @Y1 and @Y2 + * @X: array of ordinates + * @Y1: array of co-ordinates + * @Y2: array of co-ordinates + * @color: color of the markers + * + * Creates a new #GtkDataboxRegions object which can be added to a #GtkDatabox widget + * + * Return value: A new #GtkDataboxRegions object + **/ +GtkDataboxGraph * +gtk_databox_regions_new (guint len, gfloat * X, gfloat * Y1, gfloat * Y2, GdkColor * color) +{ + GtkDataboxRegions *regions; + g_return_val_if_fail (X, NULL); + g_return_val_if_fail (Y1, NULL); + g_return_val_if_fail (Y2, NULL); + g_return_val_if_fail ((len > 0), NULL); + + regions = g_object_new (GTK_DATABOX_TYPE_REGIONS, + "X-Values", X, + "Y1-Values", Y1, + "Y2-Values", Y2, + "length", len, "color", color,NULL); + + return GTK_DATABOX_GRAPH (regions); +} + +static void +gtk_databox_regions_real_draw (GtkDataboxGraph * graph, + GtkDatabox* box) +{ + GtkDataboxRegions *regions = GTK_DATABOX_REGIONS (graph); + GdkPoint *data1, *data2, *data3, *data4; + GdkGC *gc; + GdkPixmap *pixmap; + guint i = 0; + gfloat *X; + gfloat *Y1; + gfloat *Y2; + guint len; + + g_return_if_fail (GTK_DATABOX_IS_REGIONS (regions)); + g_return_if_fail (GTK_IS_DATABOX (box)); + + pixmap = gtk_databox_get_backing_pixmap (box); + + if (gtk_databox_get_scale_type_y (box) == GTK_DATABOX_SCALE_LOG) + g_warning + ("gtk_databox_regions do not work well with logarithmic scale in Y axis"); + + if (!(gc = gtk_databox_graph_get_gc(graph))) + gc = gtk_databox_graph_create_gc (graph, box); + + len = gtk_databox_xyyc_graph_get_length (GTK_DATABOX_XYYC_GRAPH (graph)); + X = gtk_databox_xyyc_graph_get_X (GTK_DATABOX_XYYC_GRAPH (graph)); + Y1 = gtk_databox_xyyc_graph_get_Y1 (GTK_DATABOX_XYYC_GRAPH (graph)); + Y2 = gtk_databox_xyyc_graph_get_Y2 (GTK_DATABOX_XYYC_GRAPH (graph)); + + data1 = regions->priv->data+1; + data2 = regions->priv->data; + data3 = regions->priv->data+2; + data4 = regions->priv->data+3; + + data3->x = gtk_databox_value_to_pixel_x (box, *X); + data3->y = gtk_databox_value_to_pixel_y (box, *Y2); + data4->x = gtk_databox_value_to_pixel_x (box, *X); + data4->y = gtk_databox_value_to_pixel_y (box, *Y1); + X++; Y1++; Y2++; + for (i = 0; i < len-1; i++, X++, Y1++, Y2++) + { + data1->x = data3->x; /* 4 points in the polygon */ + data1->y = data3->y; + data2->x = data4->x; + data2->y = data4->y; + data3->x = gtk_databox_value_to_pixel_x (box, *X); + data3->y = gtk_databox_value_to_pixel_y (box, *Y2); + data4->x = gtk_databox_value_to_pixel_x (box, *X); + data4->y = gtk_databox_value_to_pixel_y (box, *Y1); + gdk_draw_polygon (pixmap, gc, 1, /* 1 for a filled polygon*/ + regions->priv->data,4); + } + return; +} diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_regions.h libgtkdatabox-0.9.2.0/gtk/gtkdatabox_regions.h --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_regions.h 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_regions.h 2012-10-03 19:28:52.000000000 +0000 @@ -0,0 +1,89 @@ +/* $Id: gtkdatabox_regions.h 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 1998 - 2008 Dr. Roland Bock + * + * This program 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 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 Lesser 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. + */ + +/** + * SECTION:gtkdatabox_regions + * @short_description: A #GtkDataboxGraph used for displaying xxyy-values (x1, x2, y1 and y2 values) as oblongs from x1 to y1, x2 to y2. + * @include: gtkdatabox_regions.h + * @see_also: #GtkDatabox, #GtkDataboxGraph, #GtkDataboxPoints, #GtkDataboxLines, #GtkDataboxMarkers, #GtkDataboxRegions + * + * #GtkDataboxRegions is a #GtkDataboxGraph class for displaying xxyy-values as oblongs. + * + */ + +#ifndef __GTK_DATABOX_REGIONS_H__ +#define __GTK_DATABOX_REGIONS_H__ + +#include + +G_BEGIN_DECLS +#define GTK_DATABOX_TYPE_REGIONS (gtk_databox_regions_get_type ()) +#define GTK_DATABOX_REGIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + GTK_DATABOX_TYPE_REGIONS, \ + GtkDataboxRegions)) +#define GTK_DATABOX_REGIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + GTK_DATABOX_TYPE_REGIONS, \ + GtkDataboxRegionsClass)) +#define GTK_DATABOX_IS_REGIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + GTK_DATABOX_TYPE_REGIONS)) +#define GTK_DATABOX_IS_REGIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + GTK_DATABOX_TYPE_REGIONS)) +#define GTK_DATABOX_REGIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + GTK_DATABOX_TYPE_REGIONS, \ + GtkDataboxRegionsClass)) + +/** + * GtkDataboxRegions: + * @see_also: #GtkDatabox, #GtkDataboxGraph, #GtkDataboxPoints, #GtkDataboxLines, #GtkDataboxMarkers, #GtkDataboxBars, #GtkDataboxOffsetBars + * + * #GtkDataboxRegions is a #GtkDataboxGraph class for displaying xxyy-values as oblongs. + * + */ + typedef struct _GtkDataboxRegions GtkDataboxRegions; + + typedef struct _GtkDataboxRegionsClass GtkDataboxRegionsClass; + + /** + * GtkDataboxRegionsPrivate + * + * A private data structure used by the #GtkDataboxRegions. It shields all internal things + * from developers who are just using the object. + * + **/ + typedef struct _GtkDataboxRegionsPrivate GtkDataboxRegionsPrivate; + + struct _GtkDataboxRegions + { + /*< private >*/ + GtkDataboxXYYCGraph parent; + + GtkDataboxRegionsPrivate *priv; + }; + + struct _GtkDataboxRegionsClass + { + GtkDataboxXYYCGraphClass parent_class; + }; + + GType gtk_databox_regions_get_type (void); + + GtkDataboxGraph *gtk_databox_regions_new (guint len, gfloat * X, gfloat * Y1, gfloat * Y2, GdkColor * color); + +G_END_DECLS +#endif /* __GTK_DATABOX_REGIONS_H__ */ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_ruler.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_ruler.c 2012-10-03 19:28:52.000000000 +0000 @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* Modified by Roland Bock 2007, see ChangeLog */ @@ -32,143 +32,316 @@ #include #include +#include + #define RULER_SIZE 14 #define ROUND(x) ((int) ((x) + 0.5)) +#define FORMAT_LENGTH 20 /* the length of the label format string */ + +#define LINEAR_FORMAT_MARKUP "%%-+%dg" +#define LOG_FORMAT_MARKUP "%%-%dg" + static void gtk_databox_ruler_draw_ticks (GtkDataboxRuler * ruler); static void gtk_databox_ruler_draw_pos (GtkDataboxRuler * ruler); static gint gtk_databox_ruler_motion_notify (GtkWidget * widget, - GdkEventMotion * event); + GdkEventMotion * event); static void gtk_databox_ruler_realize (GtkWidget * widget); static void gtk_databox_ruler_unrealize (GtkWidget * widget); static void gtk_databox_ruler_size_allocate (GtkWidget * widget, - GtkAllocation * allocation); + GtkAllocation * allocation); static gint gtk_databox_ruler_expose (GtkWidget * widget, - GdkEventExpose * event); + GdkEventExpose * event); static void gtk_databox_ruler_make_pixmap (GtkDataboxRuler * ruler); static void gtk_databox_ruler_set_property (GObject * object, - guint prop_id, - const GValue * value, - GParamSpec * pspec); + guint prop_id, + const GValue * value, + GParamSpec * pspec); static void gtk_databox_ruler_get_property (GObject * object, - guint prop_id, - GValue * value, - GParamSpec * pspec); - -enum -{ - PROP_0, - PROP_LOWER, - PROP_UPPER, - PROP_POSITION, - PROP_MAX_LENGTH, - PROP_ORIENTATION, - PROP_END_OF_LIST + guint prop_id, + GValue * value, + GParamSpec * pspec); + +enum { + PROP_0, + PROP_LOWER, + PROP_UPPER, + PROP_POSITION, + PROP_DRAW_POSITION, + PROP_MAX_LENGTH, + PROP_ORIENTATION, + PROP_TEXT_ORIENTATION, + PROP_TEXT_ALIGNMENT, + PROP_TEXT_HOFFSET, + PROP_DRAW_TICKS, + PROP_DRAW_SUBTICKS, + PROP_MANUAL_TICKS, + PROP_MANUAL_TICK_CNT, + PROP_MANUAL_TICK_LABELS, + PROP_INVERT_EDGE, + PROP_LINEAR_LABEL_FORMAT, + PROP_LOG_LABEL_FORMAT, + PROP_BOX_SHADOW, + PROP_END_OF_LIST }; -struct _GtkDataboxRulerPrivate -{ - GdkPixmap *backing_pixmap; - gint xsrc; - gint ysrc; - /* The lower limit of the ruler */ - gdouble lower; - /* The upper limit of the ruler */ - gdouble upper; - /* The position of the mark on the ruler */ - gdouble position; - /* The maximum length of the labels (in characters) */ - guint max_length; - /* The scale type of the ruler */ - GtkDataboxScaleType scale_type; - /* Orientation of the ruler */ - GtkOrientation orientation; +struct _GtkDataboxRulerPrivate { + GdkPixmap *backing_pixmap; + gint xsrc; + gint ysrc; + /* The lower limit of the ruler */ + gdouble lower; + /* The upper limit of the ruler */ + gdouble upper; + /* The position of the mark on the ruler */ + gdouble position; + /* whether to draw the position arrows*/ + gboolean draw_position; + + /* The maximum length of the labels (in characters) */ + guint max_length; + /* The scale type of the ruler */ + GtkDataboxScaleType scale_type; + /* Orientation of the ruler */ + GtkOrientation orientation; + /* Orientation of the tick marks on the vertical ruler */ + GtkOrientation text_orientation; + + /* Whether the horizontal text on the vertical ruler is aligned left or right or center */ + PangoAlignment text_alignment; + /* horizontal tick offset (shift ticks left or right) */ + gint text_hoffset; + + /* The maximum height of text on the horizontal ruler */ + gint max_x_text_height; + /* The maximum width of text on the horizontal ruler */ + gint max_y_text_width; + + /* When true draw the ticks */ + gboolean draw_ticks; + + /* When true draw the subticks */ + gboolean draw_subticks; + + /* Whether the ruler is inverted (i.e. drawn with the edge on the left or right, top or bottom) */ + gboolean invert_edge; + + /* Strings used to mark up the g_sprintf label format - one for log scaling and one for linear scaling */ + gchar linear_format[FORMAT_LENGTH], log_format[FORMAT_LENGTH]; + + /* If we are manually setting ticks, this will be non-null */ + gfloat *manual_ticks; + guint manual_tick_cnt; + /* we have the option of manually setting the tick labels. */ + gchar **manual_tick_labels; + + GtkShadowType box_shadow; /* The type of shadow drawn on the ruler pixmap */ }; G_DEFINE_TYPE (GtkDataboxRuler, gtk_databox_ruler, GTK_TYPE_WIDGET) -static void gtk_databox_ruler_class_init (GtkDataboxRulerClass * class) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - - gobject_class = G_OBJECT_CLASS (class); - widget_class = (GtkWidgetClass *) class; - - gobject_class->set_property = gtk_databox_ruler_set_property; - gobject_class->get_property = gtk_databox_ruler_get_property; - - widget_class->realize = gtk_databox_ruler_realize; - widget_class->unrealize = gtk_databox_ruler_unrealize; - widget_class->size_allocate = gtk_databox_ruler_size_allocate; - widget_class->expose_event = gtk_databox_ruler_expose; - widget_class->motion_notify_event = gtk_databox_ruler_motion_notify; - - g_object_class_install_property (gobject_class, - PROP_LOWER, - g_param_spec_double ("lower", - "Lower", - "Lower limit of ruler", - -G_MAXDOUBLE, - G_MAXDOUBLE, - 0.0, - G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, - PROP_UPPER, - g_param_spec_double ("upper", - "Upper", - "Upper limit of ruler", - -G_MAXDOUBLE, - G_MAXDOUBLE, - 0.0, - G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, - PROP_POSITION, - g_param_spec_double ("position", - "Position", - "Position of mark on the ruler", - -G_MAXDOUBLE, - G_MAXDOUBLE, - 0.0, - G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, - PROP_MAX_LENGTH, - g_param_spec_uint ("max-length", - "Max Length", - "Maximum length of the labels (in digits)", - 2, - GTK_DATABOX_RULER_MAX_MAX_LENGTH, - 6, G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_ORIENTATION, - g_param_spec_uint ("orientation", - "Orientation", - "Orientation of the ruler: horizontal or vertical", - GTK_ORIENTATION_HORIZONTAL, - GTK_ORIENTATION_VERTICAL, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); +static void gtk_databox_ruler_class_init (GtkDataboxRulerClass * class) { + GObjectClass *gobject_class; + GtkWidgetClass *widget_class; + + gobject_class = G_OBJECT_CLASS (class); + widget_class = (GtkWidgetClass *) class; + + gobject_class->set_property = gtk_databox_ruler_set_property; + gobject_class->get_property = gtk_databox_ruler_get_property; + + widget_class->realize = gtk_databox_ruler_realize; + widget_class->unrealize = gtk_databox_ruler_unrealize; + widget_class->size_allocate = gtk_databox_ruler_size_allocate; + widget_class->expose_event = gtk_databox_ruler_expose; + widget_class->motion_notify_event = gtk_databox_ruler_motion_notify; + + g_object_class_install_property (gobject_class, + PROP_LOWER, + g_param_spec_double ("lower", + "Lower", + "Lower limit of ruler", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0.0, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_UPPER, + g_param_spec_double ("upper", + "Upper", + "Upper limit of ruler", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0.0, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_POSITION, + g_param_spec_double ("position", + "Position", + "Position of mark on the ruler", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0.0, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_DRAW_POSITION, + g_param_spec_uint ("draw-position", + "Draw Position Arrows", + "Draw the position arrows: true or false", + FALSE, + TRUE, + TRUE, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_MAX_LENGTH, + g_param_spec_uint ("max-length", + "Max Length", + "Maximum length of the labels (in digits)", + 2, + GTK_DATABOX_RULER_MAX_MAX_LENGTH, + 6, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_ORIENTATION, + g_param_spec_uint ("orientation", + "Orientation", + "Orientation of the ruler: horizontal or vertical", + GTK_ORIENTATION_HORIZONTAL, + GTK_ORIENTATION_VERTICAL, + GTK_ORIENTATION_HORIZONTAL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (gobject_class, + PROP_TEXT_ORIENTATION, + g_param_spec_uint ("text-orientation", + "Text Orientation", + "Orientation of the tick mark text (on the vertical ruler): horizontal or vertical", + GTK_ORIENTATION_HORIZONTAL, + GTK_ORIENTATION_VERTICAL, + GTK_ORIENTATION_VERTICAL, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_TEXT_ALIGNMENT, + g_param_spec_uint ("text-alignment", + "Text Alignment", + "Alignment of the tick mark text (on the vertical ruler when using horizonal text): { PANGO_ALIGN_LEFT, PANGO_ALIGN_CENTER, PANGO_ALIGN_RIGHT}", + PANGO_ALIGN_LEFT, + PANGO_ALIGN_RIGHT, + PANGO_ALIGN_LEFT, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_TEXT_HOFFSET, + g_param_spec_uint ("text-hoffset", + "Text Horizonal offset", + "Move the tick mark text left or right : pixels", + 0, + 20, + 0, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_DRAW_TICKS, + g_param_spec_uint ("draw-ticks", + "Draw Ticks", + "Draw the Ticks: true or false", + FALSE, + TRUE, + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_DRAW_SUBTICKS, + g_param_spec_uint ("draw-subticks", + "Draw Subticks", + "Draw the subticks: true or false", + FALSE, + TRUE, + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_MANUAL_TICKS, + g_param_spec_pointer ("manual-ticks", + "Manual Ticks", + "Manually specify the tick locations", + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_MANUAL_TICK_CNT, + g_param_spec_uint ("manual-tick-cnt", + "Manual Tick Count", + "The number of manual ticks in the manual_tick array: horizontal or vertical", + 0, + G_MAXUINT, + 0, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_MANUAL_TICK_LABELS, + g_param_spec_pointer ("manual-tick-labels", + "Manual Tick Labels", + "Manually specify the tick labels", + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_INVERT_EDGE, + g_param_spec_uint ("invert-edge", + "Invert Edge", + "Invert the Edge - the edge is drawn inverted: true or false", + FALSE, + TRUE, + FALSE, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_LINEAR_LABEL_FORMAT, + g_param_spec_string ("linear-label-format", + "Linear Label Format", + "Linear Label format mark up strings: marked up formatting strings for linear labels (i.e. \"%%-+%dg\")", + LINEAR_FORMAT_MARKUP, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_LOG_LABEL_FORMAT, + g_param_spec_string ("log-label-format", + "Log Label Format", + "Log Label format mark up strings: marked up formatting strings for log labels (i.e. \"%%-%dg\")", + LOG_FORMAT_MARKUP, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_BOX_SHADOW, + g_param_spec_uint ("box-shadow", + "Box Shadow", + "Style of the box shadow: GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT", + GTK_SHADOW_NONE, + GTK_SHADOW_ETCHED_OUT, + GTK_SHADOW_OUT, + G_PARAM_READWRITE)); } static void -gtk_databox_ruler_init (GtkDataboxRuler * ruler) -{ - ruler->priv = g_new0 (GtkDataboxRulerPrivate, 1); - ruler->priv->backing_pixmap = NULL; - ruler->priv->xsrc = 0; - ruler->priv->ysrc = 0; - ruler->priv->lower = 0; - ruler->priv->upper = 0; - ruler->priv->position = 0; - ruler->priv->max_length = 6; - ruler->priv->scale_type = GTK_DATABOX_SCALE_LINEAR; - ruler->priv->orientation = GTK_ORIENTATION_HORIZONTAL; -} +gtk_databox_ruler_init (GtkDataboxRuler * ruler) { + ruler->priv = g_new0 (GtkDataboxRulerPrivate, 1); + ruler->priv->backing_pixmap = NULL; + ruler->priv->xsrc = 0; + ruler->priv->ysrc = 0; + ruler->priv->lower = 0; + ruler->priv->upper = 0; + ruler->priv->position = 0; + ruler->priv->draw_position = TRUE; + ruler->priv->max_length = 6; + ruler->priv->scale_type = GTK_DATABOX_SCALE_LINEAR; + ruler->priv->orientation = GTK_ORIENTATION_HORIZONTAL; + ruler->priv->text_orientation = GTK_ORIENTATION_VERTICAL; + ruler->priv->text_hoffset=0; + ruler->priv->max_x_text_height = 0; + ruler->priv->max_y_text_width = 0; + ruler->priv->draw_ticks = TRUE; + ruler->priv->draw_subticks = TRUE; + ruler->priv->invert_edge = FALSE; + g_stpcpy(ruler->priv->linear_format, LINEAR_FORMAT_MARKUP); + g_stpcpy(ruler->priv->log_format, LOG_FORMAT_MARKUP); + ruler->priv->manual_ticks=NULL; + ruler->priv->manual_tick_cnt=0; + ruler->priv->manual_tick_labels=NULL; + ruler->priv->box_shadow=GTK_SHADOW_OUT; + } /** * gtk_databox_ruler_new: @@ -179,113 +352,184 @@ * Return value: A new #GtkDataboxRuler **/ GtkWidget * -gtk_databox_ruler_new (GtkOrientation orientation) -{ - return g_object_new (GTK_DATABOX_TYPE_RULER, "orientation", orientation, - NULL); +gtk_databox_ruler_new (GtkOrientation orientation) { + return g_object_new (GTK_DATABOX_TYPE_RULER, "orientation", orientation, + NULL); } static gint -gtk_databox_ruler_motion_notify (GtkWidget * widget, GdkEventMotion * event) -{ - GtkDataboxRuler *ruler; - gint x; - gint y; - - ruler = GTK_DATABOX_RULER (widget); - - if (event->is_hint) - { - gdk_window_get_pointer (widget->window, &x, &y, NULL); - } - else - { - x = event->x; - y = event->y; - } - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - ruler->priv->position = - ruler->priv->lower + - ((ruler->priv->upper - ruler->priv->lower) * x) / widget->allocation.width; - else - ruler->priv->position = - ruler->priv->lower + - ((ruler->priv->upper - ruler->priv->lower) * y) / widget->allocation.height; - - g_object_notify (G_OBJECT (ruler), "position"); - - /* Make sure the ruler has been allocated already */ - if (ruler->priv->backing_pixmap != NULL) - gtk_databox_ruler_draw_pos (ruler); - - return FALSE; +gtk_databox_ruler_motion_notify (GtkWidget * widget, GdkEventMotion * event) { + GtkDataboxRuler *ruler; + gint x; + gint y; + + + ruler = GTK_DATABOX_RULER (widget); + + if (gtk_databox_ruler_get_draw_position (ruler)) { + + if (event->is_hint) { + gdk_window_get_pointer (widget->window, &x, &y, NULL); + } else { + x = event->x; + y = event->y; + } + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + ruler->priv->position = + ruler->priv->lower + + ((ruler->priv->upper - ruler->priv->lower) * x) / widget->allocation.width; + else + ruler->priv->position = + ruler->priv->lower + + ((ruler->priv->upper - ruler->priv->lower) * y) / widget->allocation.height; + + g_object_notify (G_OBJECT (ruler), "position"); + + /* Make sure the ruler has been allocated already */ + if (ruler->priv->backing_pixmap != NULL) + if (ruler->priv->draw_position) + gtk_databox_ruler_draw_pos (ruler); + } + return FALSE; } static void gtk_databox_ruler_set_property (GObject * object, - guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GtkDataboxRuler *ruler = GTK_DATABOX_RULER (object); - - switch (prop_id) - { - case PROP_LOWER: - gtk_databox_ruler_set_range (ruler, g_value_get_double (value), - ruler->priv->upper, ruler->priv->position); - break; - case PROP_UPPER: - gtk_databox_ruler_set_range (ruler, ruler->priv->lower, - g_value_get_double (value), - ruler->priv->position); - break; - case PROP_POSITION: - gtk_databox_ruler_set_range (ruler, ruler->priv->lower, ruler->priv->upper, - g_value_get_double (value)); - break; - case PROP_MAX_LENGTH: - gtk_databox_ruler_set_max_length (ruler, g_value_get_uint (value)); - break; - case PROP_ORIENTATION: - gtk_databox_ruler_set_orientation (ruler, - (GtkOrientation) - g_value_get_uint (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + guint prop_id, + const GValue * value, GParamSpec * pspec) { + GtkDataboxRuler *ruler = GTK_DATABOX_RULER (object); + + switch (prop_id) { + case PROP_LOWER: + gtk_databox_ruler_set_range (ruler, g_value_get_double (value), + ruler->priv->upper, ruler->priv->position); + break; + case PROP_UPPER: + gtk_databox_ruler_set_range (ruler, ruler->priv->lower, + g_value_get_double (value), + ruler->priv->position); + break; + case PROP_POSITION: + gtk_databox_ruler_set_range (ruler, ruler->priv->lower, ruler->priv->upper, + g_value_get_double (value)); + break; + case PROP_DRAW_POSITION: + gtk_databox_ruler_set_draw_position (ruler, (gboolean) g_value_get_boolean (value)); + break; + case PROP_MAX_LENGTH: + gtk_databox_ruler_set_max_length (ruler, g_value_get_uint (value)); + break; + case PROP_ORIENTATION: + gtk_databox_ruler_set_orientation (ruler, (GtkOrientation) g_value_get_uint (value)); + break; + case PROP_TEXT_ORIENTATION: + gtk_databox_ruler_set_text_orientation (ruler, (GtkOrientation) g_value_get_uint (value)); + break; + case PROP_TEXT_ALIGNMENT: + gtk_databox_ruler_set_text_alignment (ruler, (GtkOrientation) g_value_get_uint (value)); + break; + case PROP_TEXT_HOFFSET: + gtk_databox_ruler_set_text_hoffset (ruler, (GtkOrientation) g_value_get_uint (value)); + break; + case PROP_DRAW_TICKS: + gtk_databox_ruler_set_draw_ticks (ruler, (gboolean) g_value_get_boolean (value)); + break; + case PROP_DRAW_SUBTICKS: + gtk_databox_ruler_set_draw_subticks (ruler, (gboolean) g_value_get_boolean (value)); + break; + case PROP_MANUAL_TICKS: + gtk_databox_ruler_set_manual_ticks (ruler, (gfloat *) g_value_get_pointer (value)); + break; + case PROP_MANUAL_TICK_CNT: + gtk_databox_ruler_set_manual_tick_cnt (ruler, g_value_get_uint (value)); + break; + case PROP_MANUAL_TICK_LABELS: + gtk_databox_ruler_set_manual_tick_labels (ruler, (gchar **) g_value_get_pointer (value)); + break; + case PROP_INVERT_EDGE: + gtk_databox_ruler_set_invert_edge (ruler, (gboolean) g_value_get_boolean (value)); + break; + case PROP_LINEAR_LABEL_FORMAT: + gtk_databox_ruler_set_linear_label_format (ruler, (gchar *) g_value_get_string (value)); + break; + case PROP_LOG_LABEL_FORMAT: + gtk_databox_ruler_set_log_label_format (ruler, (gchar *) g_value_get_string (value)); + break; + case PROP_BOX_SHADOW: + gtk_databox_ruler_set_box_shadow (ruler, (GtkShadowType) g_value_get_uint (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void gtk_databox_ruler_get_property (GObject * object, - guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GtkDataboxRuler *ruler = GTK_DATABOX_RULER (object); - - switch (prop_id) - { - case PROP_LOWER: - g_value_set_double (value, ruler->priv->lower); - break; - case PROP_UPPER: - g_value_set_double (value, ruler->priv->upper); - break; - case PROP_POSITION: - g_value_set_double (value, ruler->priv->position); - break; - case PROP_MAX_LENGTH: - g_value_set_uint (value, ruler->priv->max_length); - break; - case PROP_ORIENTATION: - g_value_set_uint (value, ruler->priv->orientation); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + guint prop_id, + GValue * value, GParamSpec * pspec) { + GtkDataboxRuler *ruler = GTK_DATABOX_RULER (object); + + switch (prop_id) { + case PROP_LOWER: + g_value_set_double (value, ruler->priv->lower); + break; + case PROP_UPPER: + g_value_set_double (value, ruler->priv->upper); + break; + case PROP_POSITION: + g_value_set_double (value, ruler->priv->position); + break; + case PROP_DRAW_POSITION: + g_value_set_boolean (value, ruler->priv->draw_position); + break; + case PROP_MAX_LENGTH: + g_value_set_uint (value, ruler->priv->max_length); + break; + case PROP_ORIENTATION: + g_value_set_uint (value, ruler->priv->orientation); + break; + case PROP_TEXT_ORIENTATION: + g_value_set_uint (value, ruler->priv->text_orientation); + break; + case PROP_TEXT_ALIGNMENT: + g_value_set_uint (value, ruler->priv->text_alignment); + break; + case PROP_TEXT_HOFFSET: + g_value_set_uint (value, ruler->priv->text_hoffset); + break; + case PROP_DRAW_TICKS: + g_value_set_boolean (value, ruler->priv->draw_ticks); + break; + case PROP_DRAW_SUBTICKS: + g_value_set_boolean (value, ruler->priv->draw_subticks); + break; + case PROP_MANUAL_TICKS: + g_value_set_pointer (value, ruler->priv->manual_ticks); + break; + case PROP_MANUAL_TICK_CNT: + g_value_set_uint (value, ruler->priv->manual_tick_cnt); + break; + case PROP_MANUAL_TICK_LABELS: + g_value_set_pointer (value, ruler->priv->manual_tick_labels); + break; + case PROP_INVERT_EDGE: + g_value_set_boolean (value, ruler->priv->invert_edge); + break; + case PROP_LINEAR_LABEL_FORMAT: + g_value_set_string (value, ruler->priv->linear_format); + break; + case PROP_LOG_LABEL_FORMAT: + g_value_set_string (value, ruler->priv->log_format); + break; + case PROP_BOX_SHADOW: + g_value_set_uint (value, ruler->priv->box_shadow); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } /** @@ -301,33 +545,29 @@ **/ void gtk_databox_ruler_set_range (GtkDataboxRuler * ruler, - gdouble lower, gdouble upper, gdouble position) -{ - g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); - - g_object_freeze_notify (G_OBJECT (ruler)); - if (ruler->priv->lower != lower) - { - ruler->priv->lower = lower; - g_object_notify (G_OBJECT (ruler), "lower"); - } - if (ruler->priv->upper != upper) - { - ruler->priv->upper = upper; - g_object_notify (G_OBJECT (ruler), "upper"); - } - if (ruler->priv->position != position) - { - ruler->priv->position = position; - g_object_notify (G_OBJECT (ruler), "position"); - } - g_object_thaw_notify (G_OBJECT (ruler)); + gdouble lower, gdouble upper, gdouble position) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); - if (GTK_WIDGET_DRAWABLE (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); + g_object_freeze_notify (G_OBJECT (ruler)); + if (ruler->priv->lower != lower) { + ruler->priv->lower = lower; + g_object_notify (G_OBJECT (ruler), "lower"); + } + if (ruler->priv->upper != upper) { + ruler->priv->upper = upper; + g_object_notify (G_OBJECT (ruler), "upper"); + } + if (ruler->priv->position != position) { + ruler->priv->position = position; + g_object_notify (G_OBJECT (ruler), "position"); + } + g_object_thaw_notify (G_OBJECT (ruler)); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); } -/** +/** * gtk_databox_ruler_set_max_length: * @ruler: A #GtkDataboxRuler widget * @max_length: Maximum length (digits) of tick labels @@ -340,25 +580,22 @@ * */ void -gtk_databox_ruler_set_max_length (GtkDataboxRuler * ruler, guint max_length) -{ - g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); - g_return_if_fail (max_length > 1); - g_return_if_fail (max_length < GTK_DATABOX_RULER_MAX_MAX_LENGTH + 1); - - g_object_freeze_notify (G_OBJECT (ruler)); - if (ruler->priv->max_length != max_length) - { - ruler->priv->max_length = max_length; - g_object_notify (G_OBJECT (ruler), "max-length"); - } - g_object_thaw_notify (G_OBJECT (ruler)); +gtk_databox_ruler_set_max_length (GtkDataboxRuler * ruler, guint max_length) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + g_return_if_fail (max_length < GTK_DATABOX_RULER_MAX_MAX_LENGTH + 1); + + g_object_freeze_notify (G_OBJECT (ruler)); + if (ruler->priv->max_length != max_length) { + ruler->priv->max_length = max_length; + g_object_notify (G_OBJECT (ruler), "max-length"); + } + g_object_thaw_notify (G_OBJECT (ruler)); - if (GTK_WIDGET_DRAWABLE (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); } -/** +/** * gtk_databox_ruler_set_scale_type: * @ruler: A #GtkDataboxRuler widget * @scale_type: The new scale type for @ruler (linear or logarithmic) @@ -368,18 +605,16 @@ */ void gtk_databox_ruler_set_scale_type (GtkDataboxRuler * ruler, - GtkDataboxScaleType scale_type) -{ - g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); - - if (ruler->priv->scale_type != scale_type) - { - ruler->priv->scale_type = scale_type; - /* g_object_notify (G_OBJECT (ruler), "scale-type"); */ - } + GtkDataboxScaleType scale_type) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->scale_type != scale_type) { + ruler->priv->scale_type = scale_type; + /* g_object_notify (G_OBJECT (ruler), "scale-type"); */ + } - if (GTK_WIDGET_DRAWABLE (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); } /** @@ -391,31 +626,31 @@ **/ void gtk_databox_ruler_set_orientation (GtkDataboxRuler * ruler, - GtkOrientation orientation) -{ - GtkWidget *widget; - g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); - - if (ruler->priv->orientation != orientation) - { - ruler->priv->orientation = orientation; - g_object_notify (G_OBJECT (ruler), "orientation"); - } - - widget = GTK_WIDGET (ruler); - if (orientation == GTK_ORIENTATION_HORIZONTAL) - { - widget->requisition.width = widget->style->xthickness * 2 + 1; - widget->requisition.height = widget->style->ythickness * 2 + RULER_SIZE; - } - else - { - widget->requisition.height = widget->style->ythickness * 2 + 1; - widget->requisition.width = widget->style->xthickness * 2 + RULER_SIZE; - } - - if (GTK_WIDGET_DRAWABLE (ruler)) - gtk_widget_queue_draw (GTK_WIDGET (ruler)); + GtkOrientation orientation) { + GtkWidget *widget; + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->orientation != orientation) { + ruler->priv->orientation = orientation; + g_object_notify (G_OBJECT (ruler), "orientation"); + } + + widget = GTK_WIDGET (ruler); + if (orientation == GTK_ORIENTATION_HORIZONTAL) { + widget->requisition.width = widget->style->xthickness * 2 + 1; + widget->requisition.height = widget->style->ythickness * 2 + RULER_SIZE; + } else { + widget->requisition.height = widget->style->ythickness * 2 + 1; + if (ruler->priv->max_y_text_width==0) + widget->requisition.width = widget->style->xthickness * 2 + RULER_SIZE; + else + widget->requisition.width = ruler->priv->max_y_text_width; + } + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) { + gtk_widget_queue_resize (GTK_WIDGET (ruler)); + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } } /** @@ -427,12 +662,467 @@ * Return value: Orientation of the @ruler. **/ GtkOrientation -gtk_databox_ruler_get_orientation (GtkDataboxRuler * ruler) -{ +gtk_databox_ruler_get_orientation (GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->orientation; +} + +/** + * gtk_databox_ruler_set_text_orientation: + * @ruler: a #GtkDataboxRuler + * @orientation: new orientation of the tick marks in the vertical ruler + * + * Sets the text orientation of the @ruler (vertical). + **/ +void +gtk_databox_ruler_set_text_orientation (GtkDataboxRuler * ruler, + GtkOrientation orientation) { + GtkWidget *widget; + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + /* check this is a vertical ruler */ + if (ruler->priv->orientation != GTK_ORIENTATION_VERTICAL) + return; + + if (ruler->priv->text_orientation != orientation) { + ruler->priv->text_orientation = orientation; + g_object_notify (G_OBJECT (ruler), "text-orientation"); + } + + widget = GTK_WIDGET (ruler); + widget->requisition.height = widget->style->ythickness * 2 + 1; + if (ruler->priv->max_y_text_width==0) + widget->requisition.width = widget->style->xthickness * 2 + RULER_SIZE; + else + widget->requisition.width = ruler->priv->max_y_text_width; + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + +} + +/** + * gtk_databox_ruler_get_text_orientation: + * @ruler: a #GtkDataboxRuler + * + * Gets the text orientation of the @ruler (horizontal or vertical). + * Horizontal rulers always have horizontal text + * + * Return value: Text orientation of the @ruler. + **/ +GtkOrientation +gtk_databox_ruler_get_text_orientation (GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); - g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + return ruler->priv->text_orientation; +} + +/** + * gtk_databox_ruler_set_text_alignment: + * @ruler: a #GtkDataboxRuler + * @alignment: new alignment of the tick label in the vertical ruler when horizontal text is set + * + * Sets the text alignment of the @ruler (vertical with horizontal text). + **/ +void +gtk_databox_ruler_set_text_alignment (GtkDataboxRuler * ruler, + PangoAlignment alignment) { + GtkWidget *widget; + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + /* check this is a vertical ruler */ + if (ruler->priv->orientation != GTK_ORIENTATION_VERTICAL) + return; + + if (ruler->priv->text_alignment != alignment) { + ruler->priv->text_alignment = alignment; + g_object_notify (G_OBJECT (ruler), "text-alignment"); + } + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); +} + +/** + * gtk_databox_ruler_get_text_alignment: + * @ruler: a #GtkDataboxRuler + * + * Gets the text alignment of the @ruler (vertical). + * Vertical rulers with vertical text do not use this flag + * + * Return value: Text alignment of the @ruler. + **/ +PangoAlignment +gtk_databox_ruler_get_text_alignment (GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); - return ruler->priv->orientation; + return ruler->priv->text_alignment; +} + +/** + * gtk_databox_ruler_set_text_hoffset: + * @ruler: a #GtkDataboxRuler + * @offset: new x offset of the tick label in the ruler + * + * Sets the text x (horizontal) offset of the @ruler. + **/ +void +gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler * ruler, + gint offset) { + GtkWidget *widget; + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->text_hoffset != offset) { + ruler->priv->text_hoffset = offset; + g_object_notify (G_OBJECT (ruler), "text-hoffset"); + } + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); +} + +/** + * gtk_databox_ruler_get_text_hoffset: + * @ruler: a #GtkDataboxRuler + * + * Gets the text x (horizontal) offset of the @ruler. + * + * Return value: Text horizontal (x) offset of the @ruler. + **/ +gint +gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->text_hoffset; +} + +/** + * gtk_databox_ruler_set_draw_position: + * @ruler: a #GtkDataboxRuler + * @draw: whether to draw the position arrows on the ruler at all + * + * Sets the option for drawing the position arrows. If false, don't draw any arrows, + * If true draw arrows. + **/ +void +gtk_databox_ruler_set_draw_position(GtkDataboxRuler * ruler, gboolean draw) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->draw_position!= draw) { + ruler->priv->draw_position = draw; + g_object_notify (G_OBJECT (ruler), "draw-position"); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * gtk_databox_ruler_get_draw_position: + * @ruler: a #GtkDataboxRuler + * + * Gets the draw position arrows option from the @ruler (horizontal or vertical). + * + * Return value: Position drawing option of the @ruler. + **/ +gboolean +gtk_databox_ruler_get_draw_position(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->draw_position; +} + +/** + * gtk_databox_ruler_set_draw_ticks: + * @ruler: a #GtkDataboxRuler + * @draw: whether to draw the ticks on the ruler at all + * + * Sets the option for drawing the ticks. If false, don't draw any ticks, + * If true draw major ticks and subticks if the draw_subticks boolean is set. + **/ +void +gtk_databox_ruler_set_draw_ticks(GtkDataboxRuler * ruler, gboolean draw) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->draw_ticks!= draw) { + ruler->priv->draw_ticks = draw; + g_object_notify (G_OBJECT (ruler), "draw-ticks"); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * gtk_databox_ruler_get_draw_ticks: + * @ruler: a #GtkDataboxRuler + * + * Gets the draw ticks option from the @ruler (horizontal or vertical). + * + * Return value: Tick drawing option of the @ruler. + **/ +gboolean +gtk_databox_ruler_get_draw_ticks(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->draw_ticks; +} + +/** + * gtk_databox_ruler_set_draw_subticks: + * @ruler: a #GtkDataboxRuler + * @draw: whether to draw the subticks on the ruler + * + * Sets the option for drawing the subticks + **/ +void +gtk_databox_ruler_set_draw_subticks(GtkDataboxRuler * ruler, gboolean draw) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->draw_subticks!= draw) { + ruler->priv->draw_subticks = draw; + g_object_notify (G_OBJECT (ruler), "draw-subticks"); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * gtk_databox_ruler_get_draw_subticks: + * @ruler: a #GtkDataboxRuler + * + * Gets the draw subticks option from the @ruler (horizontal or vertical). + * + * Return value: Subtick drawing option of the @ruler. + **/ +gboolean +gtk_databox_ruler_get_draw_subticks(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->draw_subticks; +} + +/** + * gtk_databox_grid_set_manual_ticks: + * @ruler: a #GtkDataboxRuler + * @manual_ticks: sets the pointer to the hline values for the @ruler + * + * Sets the ticks for the @ruler (horizontal or vertical). + **/ +void +gtk_databox_ruler_set_manual_ticks (GtkDataboxRuler * ruler, gfloat *manual_ticks) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + ruler->priv->manual_ticks = manual_ticks; + + g_object_notify (G_OBJECT(ruler), "manual-ticks"); +} + +/** + * gtk_databox_grid_get_manual_ticks: + * @ruler: a #GtkDataboxRuler + * + * Gets the pointer to the manual tick values for the @ruler. + * + * Return value: Pointer to the manual tick values for the @ruler. + **/ +gfloat* +gtk_databox_ruler_get_manual_ticks (GtkDataboxRuler * ruler) { + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), NULL); + + return ruler->priv->manual_ticks; +} + +/** + * gtk_databox_grid_set_manual_tick_cnt: + * @ruler: a #GtkDataboxRuler + * @manual_tick_cnt: sets the number of manual ticks for the @ruler + * + * Sets the number of manual ticks for the @ruler (horizontal or vertical). + **/ +void +gtk_databox_ruler_set_manual_tick_cnt (GtkDataboxRuler * ruler, guint manual_tick_cnt) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + ruler->priv->manual_tick_cnt = manual_tick_cnt; + + g_object_notify (G_OBJECT(ruler), "manual-tick-cnt"); +} + +/** + * gtk_databox_grid_get_manual_tick_cnt: + * @ruler: a #GtkDataboxRuler + * + * Gets the number manual tick values for the @ruler. + * + * Return value: The number of manual tick values for the @ruler. + **/ +guint +gtk_databox_ruler_get_manual_tick_cnt (GtkDataboxRuler * ruler) { + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->manual_tick_cnt; +} + +/** + * gtk_databox_grid_set_manual_tick_labels: + * @ruler: a #GtkDataboxRuler + * @manual_tick_labels: sets the pointer to the labels for the ticks on the @ruler + * + * Note: This function should be preceeded by calls to gtk_databox_ruler_set_manual_ticks() and gtk_databox_ruler_set_manual_tick_cnt(). + * The number of tick labels should match gtk_databox_ruler_get_manual_tick_cnt(). + * + * Sets the tick labels of the @ruler (horizontal or vertical). + **/ +void +gtk_databox_ruler_set_manual_tick_labels (GtkDataboxRuler * ruler, gchar **manual_tick_labels) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + ruler->priv->manual_tick_labels = manual_tick_labels; + + g_object_notify (G_OBJECT(ruler), "manual-tick-labels"); +} + +/** + * gtk_databox_grid_get_manual_tick_labels: + * @ruler: a #GtkDataboxRuler + * + * Gets the pointer to the manual tick labels for the @ruler. + * + * Return value: Pointer to the manual tick labels for the @ruler. + **/ +gchar** +gtk_databox_ruler_get_manual_tick_labels (GtkDataboxRuler * ruler) { + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), NULL); + + return ruler->priv->manual_tick_labels; +} + +/** + * gtk_databox_ruler_set_invert_edge: + * @ruler: a #GtkDataboxRuler + * @invert: whether to draw the ruler detail with the edge inverted + * + * Sets the option for drawing the ruler detail on the opposite edge + **/ +void +gtk_databox_ruler_set_invert_edge(GtkDataboxRuler * ruler, gboolean invert) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (ruler->priv->invert_edge!= invert) { + ruler->priv->invert_edge = invert; + g_object_notify (G_OBJECT (ruler), "invert-edge"); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * gtk_databox_ruler_get_invert_edge: + * @ruler: a #GtkDataboxRuler + * + * Gets the invert edge option from the @ruler (horizontal or vertical). + * + * Return value: Edge inversion option of the @ruler. + **/ +gboolean +gtk_databox_ruler_get_invert_edge(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->invert_edge; +} + +/** + * gtk_databox_ruler_set_linear_label_format: + * @ruler: a #GtkDataboxRuler + * @invert: How to format the labels for linear rulers + * + * Sets the meta format string for the labels of linear rulers, for example "%%+-%dg" will become "%+-#g" where # is the int variable + **/ +void +gtk_databox_ruler_set_linear_label_format(GtkDataboxRuler * ruler, gchar *format) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (g_strcmp0(ruler->priv->linear_format, format)!=0) { + if (strlen(format)>FORMAT_LENGTH) { + g_warning("maximum format length = %d chars exceeded, truncating to the maximum from %d",FORMAT_LENGTH,(int)strlen(format)); + format[FORMAT_LENGTH]='\0'; + } + + g_stpcpy(ruler->priv->linear_format, format); + g_object_notify (G_OBJECT (ruler), "linear-label-format"); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * gtk_databox_ruler_get_linear_label_format: + * @ruler: a #GtkDataboxRuler + * + * Gets the linear label meta format of the @ruler (horizontal or vertical). + * + * Return value: The string meta format the @ruler NULL on failure. + **/ +gchar* +gtk_databox_ruler_get_linear_label_format(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), NULL); + + return ruler->priv->linear_format; +} + +/** + * gtk_databox_ruler_set_log_label_format: + * @ruler: a #GtkDataboxRuler + * @invert: How to format the labels for log scaled rulers + * + * Sets the meta format string for the labels of log scaled rulers, for example "%%-%dg" will become "%-#g" where # is the int variable + **/ +void +gtk_databox_ruler_set_log_label_format(GtkDataboxRuler * ruler, gchar *format) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (g_strcmp0(ruler->priv->log_format, format)!=0) { + if (strlen(format)>FORMAT_LENGTH) { + g_warning("maximum format length = %d chars exceeded, truncating to the maximum from %d",FORMAT_LENGTH,(int)strlen(format)); + format[FORMAT_LENGTH]='\0'; + } + + g_stpcpy(ruler->priv->log_format, format); + g_object_notify (G_OBJECT (ruler), "log-label-format"); + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * gtk_databox_ruler_get_log_label_format: + * @ruler: a #GtkDataboxRuler + * + * Gets the log label meta format of the @ruler (horizontal or vertical). + * + * Return value: The string meta format the @ruler, NULL on failure. + **/ +gchar* +gtk_databox_ruler_get_log_label_format(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), NULL); + + return ruler->priv->log_format; } /** @@ -447,20 +1137,19 @@ **/ void gtk_databox_ruler_get_range (GtkDataboxRuler * ruler, - gdouble * lower, - gdouble * upper, gdouble * position) -{ - g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); - - if (lower) - *lower = ruler->priv->lower; - if (upper) - *upper = ruler->priv->upper; - if (position) - *position = ruler->priv->position; + gdouble * lower, + gdouble * upper, gdouble * position) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + + if (lower) + *lower = ruler->priv->lower; + if (upper) + *upper = ruler->priv->upper; + if (position) + *position = ruler->priv->position; } -/** +/** * gtk_databox_ruler_get_max_length: * @ruler: A #GtkDataboxRuler widget * @@ -471,14 +1160,13 @@ * */ guint -gtk_databox_ruler_get_max_length (GtkDataboxRuler * ruler) -{ - g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), 0); +gtk_databox_ruler_get_max_length (GtkDataboxRuler * ruler) { + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), 0); - return ruler->priv->max_length; + return ruler->priv->max_length; } -/** +/** * gtk_databox_ruler_get_scale_type: * @ruler: A #GtkDataboxRuler widget * @@ -488,469 +1176,525 @@ * */ GtkDataboxScaleType -gtk_databox_ruler_get_scale_type (GtkDataboxRuler * ruler) -{ - g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), 0); +gtk_databox_ruler_get_scale_type (GtkDataboxRuler * ruler) { + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), 0); + + return ruler->priv->scale_type; +} + +/** + * gtk_databox_ruler_set_box_shadow: + * @ruler: a #GtkDataboxRuler + * @which_shadow: How to render the box shadow on the ruler edges. + * + * Sets the shadow type when using gtk_paint_box. This will draw the desired edge shadow. + **/ +void +gtk_databox_ruler_set_box_shadow(GtkDataboxRuler * ruler, GtkShadowType which_shadow) { + g_return_if_fail (GTK_DATABOX_IS_RULER (ruler)); + g_return_if_fail (which_shadow>=0); + g_return_if_fail (which_shadow<=GTK_SHADOW_ETCHED_OUT); + + if (ruler->priv->box_shadow!=which_shadow) { + ruler->priv->box_shadow=which_shadow; + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} - return ruler->priv->scale_type; +/** + * gtk_databox_ruler_get_box_shadow: + * @ruler: a #GtkDataboxRuler + * + * Gets the type of shadow being rendered to the @ruler (GTK_SHADOW_NONE, GTK_SHADOW_IN, GTK_SHADOW_OUT, GTK_SHADOW_ETCHED_IN, GTK_SHADOW_ETCHED_OUT). + * + * Return value: The currently used shadow type of the @ruler, -1 on failure. + **/ +GtkShadowType +gtk_databox_ruler_get_box_shadow(GtkDataboxRuler * ruler) { + + g_return_val_if_fail (GTK_DATABOX_IS_RULER (ruler), -1); + + return ruler->priv->box_shadow; } static void -gtk_databox_ruler_draw_ticks (GtkDataboxRuler * ruler) -{ - GtkWidget *widget; - cairo_t *cr; - gint i; - gint width, height; - gint xthickness; - gint ythickness; - gint length; - gdouble lower, upper; /* Upper and lower limits */ - gdouble increment; /* pixel per value unit */ - gint power; - gint digit; - gdouble subd_incr; - gdouble start, end, cur; - gchar unit_str[GTK_DATABOX_RULER_MAX_MAX_LENGTH + 1]; /* buffer for writing numbers */ - gint digit_width; - gint digit_height; - gint digit_offset; - gint text_width; - gint pos; - gchar format_string[10]; - PangoMatrix matrix = PANGO_MATRIX_INIT; - PangoContext *context; - PangoLayout *layout; - PangoRectangle logical_rect, ink_rect; - - if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) - g_sprintf (format_string, "%%-+%dg", ruler->priv->max_length - 1); - else - g_sprintf (format_string, "%%-%dg", ruler->priv->max_length - 1); - - - if (!GTK_WIDGET_DRAWABLE (ruler)) - return; - - widget = GTK_WIDGET (ruler); - - xthickness = widget->style->xthickness; - ythickness = widget->style->ythickness; - - layout = gtk_widget_create_pango_layout (widget, "E+-012456789"); - pango_layout_get_pixel_extents (layout, &ink_rect, &logical_rect); - - digit_width = ceil ((logical_rect.width) / 12); - digit_height = (logical_rect.height) + 2; - digit_offset = ink_rect.y; - - if (ruler->priv->orientation == GTK_ORIENTATION_VERTICAL) - { - context = gtk_widget_get_pango_context (widget); - pango_context_set_base_gravity (context, PANGO_GRAVITY_WEST); - pango_matrix_rotate (&matrix, 90.); - pango_context_set_matrix (context, &matrix); - } - - width = widget->allocation.width; - height = widget->allocation.height; - - gtk_paint_box (widget->style, ruler->priv->backing_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, widget, "ruler", 0, 0, width, height); - - cr = gdk_cairo_create (ruler->priv->backing_pixmap); - gdk_cairo_set_source_color (cr, &widget->style->fg[widget->state]); - - cairo_rectangle (cr, - xthickness, - height - ythickness, width - 2 * xthickness, 1); - - if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) - { - upper = ruler->priv->upper; - lower = ruler->priv->lower; - } - else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) - { - if (ruler->priv->upper <= 0 || ruler->priv->lower <= 0) - { - g_warning - ("For logarithmic scaling, the visible limits must by larger than 0!"); - } - upper = log2 (ruler->priv->upper); - lower = log2 (ruler->priv->lower); - } - else - { - if (ruler->priv->upper <= 0 || ruler->priv->lower <= 0) - { - g_warning - ("For logarithmic scaling, the visible limits must by larger than 0!"); - } - upper = log10 (ruler->priv->upper); - lower = log10 (ruler->priv->lower); - } - - if ((upper - lower) == 0) - goto out; - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - increment = (gdouble) width / (upper - lower); - else - increment = (gdouble) height / (upper - lower); - - - /* determine the scale, i.e. the distance between the most significant ticks - * - * the ticks have to be farther apart than the length of the displayed numbers - */ - if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) - { - text_width = (ruler->priv->max_length) * digit_width + 1; - - for (power = -20; power < 21; power++) - { - if ((digit = 1) * pow (10, power) * fabs (increment) > text_width) - break; - if ((digit = 2.5) * pow (10, power) * fabs (increment) > text_width) - break; - if ((digit = 5) * pow (10, power) * fabs (increment) > text_width) - break; - } - - - if (power == 21) - { - power = 20; - digit = 5; - } - subd_incr = digit * pow (10, power); - } - else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) - { - subd_incr = 1.; - } - else - { - subd_incr = 1.; - } - - length = (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - ? height - 1 : width - 1; - - if (lower < upper) - { - start = floor (lower / subd_incr) * subd_incr; - end = ceil (upper / subd_incr) * subd_incr; - } - else - { - start = floor (upper / subd_incr) * subd_incr; - end = ceil (lower / subd_incr) * subd_incr; - } - - - for (cur = start; cur <= end; cur += subd_incr) - { - pos = ROUND ((cur - lower) * increment); - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - cairo_rectangle (cr, pos, height + ythickness - length, 1, length); - else - cairo_rectangle (cr, width + xthickness - length, pos, length, 1); - - - /* draw label */ - if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) - { - if (ABS (cur) < 0.1 * subd_incr) /* Rounding errors occur and might make "0" look funny without this check */ - cur = 0; - - g_snprintf (unit_str, ruler->priv->max_length + 1, format_string, cur); - } - else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) - g_snprintf (unit_str, ruler->priv->max_length + 1, format_string, - pow (2, cur)); - else - g_snprintf (unit_str, ruler->priv->max_length + 1, format_string, - pow (10, cur)); - - pango_layout_set_text (layout, unit_str, -1); - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - gtk_paint_layout (widget->style, - ruler->priv->backing_pixmap, - GTK_WIDGET_STATE (widget), - FALSE, - NULL, - widget, "ruler", pos + 2, ythickness - 1, layout); - else - gtk_paint_layout (widget->style, - ruler->priv->backing_pixmap, - GTK_WIDGET_STATE (widget), - FALSE, - NULL, - widget, - "ruler", - xthickness - 1, - pos - logical_rect.width - 2, layout); - - /* Draw sub-ticks */ - if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) - for (i = 1; i < 5; ++i) - { - pos = ROUND ((cur - lower + subd_incr / 5 * i) * increment); - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - cairo_rectangle (cr, - pos, height + ythickness - length / 2, - 1, length / 2); - else - cairo_rectangle (cr, - width + xthickness - length / 2, pos, - length / 2, 1); - } - else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) - for (i = 1; i < 8; ++i) - { - pos = ROUND ((cur - lower + log2 (i)) * increment); - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - cairo_rectangle (cr, - pos, height + ythickness - length / 2, - 1, length / 2); - else - cairo_rectangle (cr, - width + xthickness - length / 2, pos, - length / 2, 1); - } - else - for (i = 2; i < 10; ++i) - { - pos = ROUND ((cur - lower + log10 (i)) * increment); - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - cairo_rectangle (cr, - pos, height + ythickness - length / 2, - 1, length / 2); - else - cairo_rectangle (cr, - width + xthickness - length / 2, pos, - length / 2, 1); - } - - } - - cairo_fill (cr); - out: - cairo_destroy (cr); +gtk_databox_ruler_draw_ticks (GtkDataboxRuler * ruler) { + GtkWidget *widget; + cairo_t *cr; + gint i; + gint width, height; + gint xthickness; + gint ythickness; + gint length; + gdouble lower, upper; /* Upper and lower limits */ + gdouble increment; /* pixel per value unit */ + gint power; + gint digit; + gdouble subd_incr; + gdouble start, end, cur, cur_text; + gchar unit_str[GTK_DATABOX_RULER_MAX_MAX_LENGTH + 1]; /* buffer for writing numbers */ + gint digit_width; + gint text_width; + gint pos; + gint y_loc, x_loc; + gint subtick_start; + gchar format_string[FORMAT_LENGTH]; + PangoMatrix matrix = PANGO_MATRIX_INIT; + PangoContext *context; + PangoLayout *layout; + PangoRectangle logical_rect, ink_rect; + + if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) + if (ruler->priv->max_length==1) + g_snprintf (format_string, FORMAT_LENGTH, ruler->priv->linear_format, ruler->priv->max_length); + else + g_snprintf (format_string, FORMAT_LENGTH, ruler->priv->linear_format, ruler->priv->max_length - 1); + else if (ruler->priv->max_length==1) + g_snprintf (format_string, FORMAT_LENGTH, ruler->priv->log_format, ruler->priv->max_length); + else + g_snprintf (format_string, FORMAT_LENGTH, ruler->priv->log_format, ruler->priv->max_length - 1); + + if (!gtk_widget_is_drawable (GTK_WIDGET (ruler))) + return; + + widget = GTK_WIDGET (ruler); + + xthickness = widget->style->xthickness; + ythickness = widget->style->ythickness; + + layout = gtk_widget_create_pango_layout (widget, "E+-012456789"); + + if ((ruler->priv->orientation == GTK_ORIENTATION_VERTICAL) && (ruler->priv->text_orientation == GTK_ORIENTATION_VERTICAL)) { + /* vertical ruler with vertical text */ + context = gtk_widget_get_pango_context (widget); + pango_context_set_base_gravity (context, PANGO_GRAVITY_WEST); + pango_matrix_rotate (&matrix, 90.); + pango_context_set_matrix (context, &matrix); + pango_layout_context_changed(layout); + } + + pango_layout_get_pixel_extents (layout, &ink_rect, &logical_rect); + + digit_width = ceil ((logical_rect.width) / 12); + + width = widget->allocation.width; + height = widget->allocation.height; + gtk_paint_box (widget->style, ruler->priv->backing_pixmap, + GTK_STATE_NORMAL, ruler->priv->box_shadow, + NULL, widget, "ruler", 0, 0, width, height); + + cr = gdk_cairo_create (ruler->priv->backing_pixmap); + gdk_cairo_set_source_color (cr, &widget->style->fg[widget->state]); + + if (ruler->priv->draw_ticks) /* only draw the bottom line IF we are drawing ticks */ + cairo_rectangle (cr, xthickness, height - ythickness, width - 2 * xthickness, 1); + + if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) { + upper = ruler->priv->upper; + lower = ruler->priv->lower; + } else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) { + if (ruler->priv->upper <= 0 || ruler->priv->lower <= 0) { + g_warning + ("For logarithmic scaling, the visible limits must by larger than 0!"); + } + upper = log2 (ruler->priv->upper); + lower = log2 (ruler->priv->lower); + } else { + if (ruler->priv->upper <= 0 || ruler->priv->lower <= 0) { + g_warning + ("For logarithmic scaling, the visible limits must by larger than 0!"); + } + upper = log10 (ruler->priv->upper); + lower = log10 (ruler->priv->lower); + } + + if ((upper - lower) == 0) + goto out; + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + increment = (gdouble) width / (upper - lower); + else + increment = (gdouble) height / (upper - lower); + + + /* determine the scale, i.e. the distance between the most significant ticks + * + * the ticks have to be farther apart than the length of the displayed numbers + */ + if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) { + text_width = (ruler->priv->max_length) * digit_width + 1; + + for (power = -20; power < 21; power++) { + if ((digit = 1) * pow (10, power) * fabs (increment) > text_width) + break; + if ((digit = 2.5) * pow (10, power) * fabs (increment) > text_width) + break; + if ((digit = 5) * pow (10, power) * fabs (increment) > text_width) + break; + } + + + if (power == 21) { + power = 20; + digit = 5; + } + subd_incr = digit * pow (10, power); + } else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) { + subd_incr = 1.; + } else { + subd_incr = 1.; + } + + length = (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + ? height - 1 : width - 1; + + if (ruler->priv->manual_ticks==NULL) + if (lower < upper) { + start = floor (lower / subd_incr) * subd_incr; + end = ceil (upper / subd_incr) * subd_incr; + } else { + start = floor (upper / subd_incr) * subd_incr; + end = ceil (lower / subd_incr) * subd_incr; + } + else { /* we are manually setting the tick labels and marks. */ + start = 0.; + end = (gfloat)ruler->priv->manual_tick_cnt-1; + subd_incr=1.; + } + + + for (cur = start; cur <= end; cur += subd_incr) { + if (ruler->priv->manual_ticks==NULL) + pos = ROUND (((cur_text=cur) - lower) * increment); + else { + /* manual ticks must be positioned according to the scale */ + if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) + cur_text=ruler->priv->manual_ticks[(int)cur]; + else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) + cur_text=log2(ruler->priv->manual_ticks[(int)cur]); + else + cur_text=log10(ruler->priv->manual_ticks[(int)cur]); + pos = ROUND ((cur_text - lower) * increment); + cur_text=ruler->priv->manual_ticks[(int)cur]; + } + if (ruler->priv->draw_ticks) { + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + cairo_rectangle (cr, pos, height + ythickness - length, 1, length); + else + cairo_rectangle (cr, width + xthickness - length, pos, length, 1); + } + + + /* draw label */ + /* if manual tick labels are present, display them instead of calculated labels */ + if ((ruler->priv->manual_ticks!=NULL) && (ruler->priv->manual_tick_cnt!=0) && (ruler->priv->manual_tick_labels!=NULL)) + pango_layout_set_text (layout, ruler->priv->manual_tick_labels[(int)cur], -1); + else { + if ((ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) || (ruler->priv->manual_ticks!=NULL)) { + if (ABS (cur_text) < 0.1 * subd_incr) /* Rounding errors occur and might make "0" look funny without this check */ + cur_text = 0; + + g_snprintf (unit_str, ruler->priv->max_length + 1, format_string, cur_text); + } else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) + g_snprintf (unit_str, ruler->priv->max_length + 1, format_string, pow (2, cur_text)); + else + g_snprintf (unit_str, ruler->priv->max_length + 1, format_string, pow (10, cur_text)); + + pango_layout_set_text (layout, unit_str, -1); + } + pango_layout_get_pixel_extents (layout, &ink_rect, &logical_rect); + + /* remember the pixel extents for sizing later. */ + if ((ruler->priv->orientation == GTK_ORIENTATION_VERTICAL) & (ruler->priv->max_y_text_widthpriv->text_orientation ==GTK_ORIENTATION_VERTICAL) + ruler->priv->max_y_text_width=logical_rect.height; + else + ruler->priv->max_y_text_width=logical_rect.width; + gtk_widget_set_size_request(GTK_WIDGET(ruler), ruler->priv->max_y_text_width, ruler->priv->max_x_text_height); + /*printf("set ruler->priv->max_x_text_height=%d\n",ruler->priv->max_x_text_height); + printf("set ruler->priv->max_y_text_width=%d\n",ruler->priv->max_y_text_width);*/ + } else if (ruler->priv->max_x_text_heightpriv->max_x_text_height=logical_rect.height; + gtk_widget_set_size_request(GTK_WIDGET(ruler), ruler->priv->max_y_text_width, ruler->priv->max_x_text_height); + /*printf("set ruler->priv->max_x_text_height=%d\n",ruler->priv->max_x_text_height); + printf("set ruler->priv->max_y_text_width=%d\n",ruler->priv->max_y_text_width);*/ + } + + + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL){ + if (!ruler->priv->draw_ticks) /* if ticks aren't present, draw a little lower */ + pos=pos - logical_rect.width+2+ruler->priv->text_hoffset; + gtk_paint_layout (widget->style, + ruler->priv->backing_pixmap, + gtk_widget_get_state (widget), + FALSE, + NULL, + widget, "ruler", pos + 2, ythickness - 1, layout); + } else { + y_loc=pos - logical_rect.width - 2; /* standard vertical text y alignment */ + if (ruler->priv->text_orientation == GTK_ORIENTATION_HORIZONTAL) /* if ticks are present, then draw a little higher */ + y_loc=pos - logical_rect.width*2/3; /* horizontal text y alignment */ + if (ruler->priv->text_orientation == GTK_ORIENTATION_HORIZONTAL & !ruler->priv->draw_ticks) /* if ticks aren't present, draw a little lower */ + y_loc=pos - logical_rect.width/3; + x_loc=xthickness-1+ruler->priv->text_hoffset; + if (ruler->priv->text_orientation == GTK_ORIENTATION_HORIZONTAL & ruler->priv->text_alignment == PANGO_ALIGN_RIGHT) /* set right adjusted text */ + x_loc=width-ink_rect.width-2+ruler->priv->text_hoffset; /* shift 2 pixels left to give a better aesthetic */ + if (ruler->priv->text_orientation == GTK_ORIENTATION_HORIZONTAL & ruler->priv->text_alignment == PANGO_ALIGN_CENTER) /* set centrally adjusted text */ + x_loc=(width-ink_rect.width)/2-2+ruler->priv->text_hoffset; + gtk_paint_layout (widget->style, + ruler->priv->backing_pixmap, + gtk_widget_get_state (widget), + FALSE, + NULL, + widget, "ruler", x_loc, y_loc, layout); + } + + /* Draw sub-ticks */ + if (ruler->priv->draw_subticks & ruler->priv->draw_ticks) { + if (!ruler->priv->invert_edge) /* sub-ticks on the bottom */ + subtick_start=length / 2; + else + subtick_start=length; + + if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LINEAR) + for (i = 1; i < 5; ++i) { + pos = ROUND ((cur - lower + subd_incr / 5 * i) * increment); + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + cairo_rectangle (cr, pos, height + ythickness - subtick_start, 1, length / 2); + else + cairo_rectangle (cr, width + xthickness - subtick_start, pos, length / 2, 1); + } + else if (ruler->priv->scale_type == GTK_DATABOX_SCALE_LOG2) + for (i = 1; i < 8; ++i) { + pos = ROUND ((cur - lower + log2 (i)) * increment); + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + cairo_rectangle (cr, pos, height + ythickness - subtick_start, 1, length / 2); + else + cairo_rectangle (cr, width + xthickness - subtick_start, pos, length / 2, 1); + } + else + for (i = 2; i < 10; ++i) { + pos = ROUND ((cur - lower + log10 (i)) * increment); + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + cairo_rectangle (cr, pos, height + ythickness - subtick_start, 1, length / 2); + else + cairo_rectangle (cr, width + xthickness - subtick_start, pos, length / 2, 1); + } + } + } + + cairo_fill (cr); +out: + cairo_destroy (cr); - g_object_unref (layout); + g_object_unref (layout); } static void -gtk_databox_ruler_draw_pos (GtkDataboxRuler * ruler) -{ - GtkWidget *widget = GTK_WIDGET (ruler); - gint x, y; - gint width, height; - gint bs_width, bs_height; - gint xthickness; - gint ythickness; - gdouble increment; - - if (GTK_WIDGET_DRAWABLE (ruler)) - { - xthickness = widget->style->xthickness; - ythickness = widget->style->ythickness; - width = widget->allocation.width - xthickness * 2; - height = widget->allocation.height - ythickness * 2; - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - bs_width = height / 2 + 2; - bs_width |= 1; /* make sure it's odd */ - bs_height = bs_width / 2 + 1; - } - else - { - bs_height = width / 2 + 2; - bs_height |= 1; /* make sure it's odd */ - bs_width = bs_height / 2 + 1; - } - - if ((bs_width > 0) && (bs_height > 0)) - { - cairo_t *cr = gdk_cairo_create (widget->window); - - /* If a backing store exists, restore the ruler */ - if (ruler->priv->backing_pixmap) - gdk_draw_drawable (widget->window, - widget->style->black_gc, - ruler->priv->backing_pixmap, - ruler->priv->xsrc, ruler->priv->ysrc, - ruler->priv->xsrc, ruler->priv->ysrc, bs_width, bs_height); - - if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - increment = (gdouble) width / (ruler->priv->upper - ruler->priv->lower); - - x = ROUND ((ruler->priv->position - ruler->priv->lower) * increment) + - (xthickness - bs_width) / 2 - 1; - y = (height + bs_height) / 2 + ythickness; - - gdk_cairo_set_source_color (cr, - &widget->style->fg[widget->state]); - - cairo_move_to (cr, x, y); - cairo_line_to (cr, x + bs_width / 2., y + bs_height); - cairo_line_to (cr, x + bs_width, y); - } - else - { - increment = (gdouble) height / (ruler->priv->upper - ruler->priv->lower); - - x = (width + bs_width) / 2 + xthickness; - y = ROUND ((ruler->priv->position - ruler->priv->lower) * increment) + - (ythickness - bs_height) / 2 - 1; - - gdk_cairo_set_source_color (cr, - &widget->style->fg[widget->state]); - - cairo_move_to (cr, x, y); - cairo_line_to (cr, x + bs_width, y + bs_height / 2.); - cairo_line_to (cr, x, y + bs_height); - } - cairo_fill (cr); - - cairo_destroy (cr); - - ruler->priv->xsrc = x; - ruler->priv->ysrc = y; - } - } +gtk_databox_ruler_draw_pos (GtkDataboxRuler * ruler) { + GtkWidget *widget = GTK_WIDGET (ruler); + gint x, y; + gint width, height; + gint bs_width, bs_height; + gint xthickness; + gint ythickness; + gdouble increment; + cairo_t *cr; + + if (gtk_widget_is_drawable (GTK_WIDGET (ruler))) { + xthickness = widget->style->xthickness; + ythickness = widget->style->ythickness; + width = widget->allocation.width - xthickness * 2; + height = widget->allocation.height - ythickness * 2; + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) { + bs_width = height / 2 + 2; + bs_width |= 1; /* make sure it's odd */ + bs_height = bs_width / 2 + 1; + if (ruler->priv->invert_edge) + bs_height=-bs_height; + } else { + bs_height = width / 2 + 2; + bs_height |= 1; /* make sure it's odd */ + bs_width = bs_height / 2 + 1; + if (ruler->priv->invert_edge) + bs_width=-bs_width; + } + + if (!ruler->priv->invert_edge && (bs_width < 0) && (bs_height < 0)) + return; /* return if negative values and not inverted */ + + if (ruler->priv->invert_edge && (bs_width > 0) && (bs_height > 0)) + return; /* return if positive values and inverted */ + + cr = gdk_cairo_create (widget->window); + + /* If a backing store exists, restore the ruler */ + if (ruler->priv->backing_pixmap) + gdk_draw_drawable (widget->window, + widget->style->black_gc, + ruler->priv->backing_pixmap, + ruler->priv->xsrc, ruler->priv->ysrc, + ruler->priv->xsrc, ruler->priv->ysrc, bs_width, bs_height); + + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) { + increment = (gdouble) width / (ruler->priv->upper - ruler->priv->lower); + + x = ROUND ((ruler->priv->position - ruler->priv->lower) * increment) + + (xthickness - bs_width) / 2 - 1; + y = (height + bs_height) / 2 + ythickness; + + gdk_cairo_set_source_color (cr, &widget->style->fg[widget->state]); + + cairo_move_to (cr, x, y); + cairo_line_to (cr, x + bs_width / 2., y + bs_height); + cairo_line_to (cr, x + bs_width, y); + } else { + increment = (gdouble) height / (ruler->priv->upper - ruler->priv->lower); + + x = (width + bs_width) / 2 + xthickness; + y = ROUND ((ruler->priv->position - ruler->priv->lower) * increment) + + (ythickness - bs_height) / 2 - 1; + + gdk_cairo_set_source_color (cr, &widget->style->fg[widget->state]); + + cairo_move_to (cr, x, y); + cairo_line_to (cr, x + bs_width, y + bs_height / 2.); + cairo_line_to (cr, x, y + bs_height); + } + cairo_fill (cr); + + cairo_destroy (cr); + + /* remember the rectangle of the arrow - so that it may be cleared on re-run */ + ruler->priv->xsrc = x; + ruler->priv->ysrc = y; + if (ruler->priv->invert_edge) { /* inverted edges need clearing in the negative direction */ + if (ruler->priv->orientation == GTK_ORIENTATION_HORIZONTAL) + ruler->priv->ysrc = y+bs_height; /* bs_height is negative */ + else + ruler->priv->xsrc = x+bs_width; /* bs_width is negative */ + } + } } static void -gtk_databox_ruler_realize (GtkWidget * widget) -{ - GtkDataboxRuler *ruler; - GdkWindowAttr attributes; - gint attributes_mask; - - ruler = GTK_DATABOX_RULER (widget); - GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = gtk_widget_get_events (widget); - attributes.event_mask |= (GDK_EXPOSURE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK); - - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - - widget->window = - gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, - attributes_mask); - gdk_window_set_user_data (widget->window, ruler); +gtk_databox_ruler_realize (GtkWidget * widget) { + GtkDataboxRuler *ruler; + GdkWindowAttr attributes; + gint attributes_mask; + + ruler = GTK_DATABOX_RULER (widget); + + gtk_widget_set_realized(GTK_WIDGET (ruler), GTK_REALIZED); + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = gtk_widget_get_events (widget); + attributes.event_mask |= (GDK_EXPOSURE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + widget->window = + gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, + attributes_mask); + gdk_window_set_user_data (widget->window, ruler); - widget->style = gtk_style_attach (widget->style, widget->window); - gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE); + widget->style = gtk_style_attach (widget->style, widget->window); + gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE); - gtk_databox_ruler_make_pixmap (ruler); + gtk_databox_ruler_make_pixmap (ruler); } static void -gtk_databox_ruler_unrealize (GtkWidget * widget) -{ - GtkDataboxRuler *ruler = GTK_DATABOX_RULER (widget); - - if (ruler->priv->backing_pixmap) - g_object_unref (ruler->priv->backing_pixmap); - - g_free (ruler->priv); - - if (GTK_WIDGET_CLASS (gtk_databox_ruler_parent_class)->unrealize) - (*GTK_WIDGET_CLASS (gtk_databox_ruler_parent_class)-> - unrealize) (widget); +gtk_databox_ruler_unrealize (GtkWidget * widget) { + GtkDataboxRuler *ruler = GTK_DATABOX_RULER (widget); + gtk_widget_set_realized(widget, FALSE); + + if (ruler->priv->backing_pixmap) + g_object_unref (ruler->priv->backing_pixmap); + ruler->priv->backing_pixmap=NULL; + + + if (GTK_WIDGET_CLASS (gtk_databox_ruler_parent_class)->unrealize) + (*GTK_WIDGET_CLASS (gtk_databox_ruler_parent_class)->unrealize) (widget); } static void gtk_databox_ruler_size_allocate (GtkWidget * widget, - GtkAllocation * allocation) -{ - GtkDataboxRuler *ruler = GTK_DATABOX_RULER (widget); - - widget->allocation = *allocation; - - if (GTK_WIDGET_REALIZED (widget)) - { - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, - allocation->width, allocation->height); + GtkAllocation * allocation) { + GtkDataboxRuler *ruler = GTK_DATABOX_RULER (widget); + + widget->allocation = *allocation; + + if (gtk_widget_get_realized (widget)) + if (gtk_widget_is_drawable(widget)) { + gdk_window_move_resize (widget->window, + allocation->x, allocation->y, + allocation->width, allocation->height); - gtk_databox_ruler_make_pixmap (ruler); - } + gtk_databox_ruler_make_pixmap (ruler); + } } static gint -gtk_databox_ruler_expose (GtkWidget * widget, GdkEventExpose * event) -{ - GtkDataboxRuler *ruler; - - if (GTK_WIDGET_DRAWABLE (widget)) - { - ruler = GTK_DATABOX_RULER (widget); - - gtk_databox_ruler_draw_ticks (ruler); - - gdk_draw_drawable (widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE (ruler)], - ruler->priv->backing_pixmap, - 0, 0, 0, 0, - widget->allocation.width, widget->allocation.height); +gtk_databox_ruler_expose (GtkWidget * widget, GdkEventExpose * event) { + GtkDataboxRuler *ruler; + + if (gtk_widget_is_drawable (widget)) { + ruler = GTK_DATABOX_RULER (widget); + + gtk_databox_ruler_draw_ticks (ruler); + + gdk_draw_drawable (widget->window, + widget->style->fg_gc[gtk_widget_get_state (GTK_WIDGET (ruler))], + ruler->priv->backing_pixmap, + 0, 0, 0, 0, + widget->allocation.width, widget->allocation.height); - gtk_databox_ruler_draw_pos (ruler); - } + if (ruler->priv->draw_position) + gtk_databox_ruler_draw_pos (ruler); + } - return FALSE; + return FALSE; } static void -gtk_databox_ruler_make_pixmap (GtkDataboxRuler * ruler) -{ - GtkWidget *widget; - gint width; - gint height; - - widget = GTK_WIDGET (ruler); - - if (ruler->priv->backing_pixmap) - { - gdk_drawable_get_size (ruler->priv->backing_pixmap, &width, &height); - if ((width == widget->allocation.width) && - (height == widget->allocation.height)) - return; - - g_object_unref (ruler->priv->backing_pixmap); - } - - ruler->priv->backing_pixmap = gdk_pixmap_new (widget->window, - widget->allocation.width, - widget->allocation.height, -1); +gtk_databox_ruler_make_pixmap (GtkDataboxRuler * ruler) { + GtkWidget *widget; + gint width; + gint height; + + widget = GTK_WIDGET (ruler); + + if (ruler->priv->backing_pixmap) { + gdk_pixmap_get_size (ruler->priv->backing_pixmap, &width, &height); + if ((width == widget->allocation.width) && + (height == widget->allocation.height)) + return; + + g_object_unref (ruler->priv->backing_pixmap); + } + + ruler->priv->backing_pixmap = gdk_pixmap_new (widget->window, + widget->allocation.width, + widget->allocation.height, -1); - ruler->priv->xsrc = 0; - ruler->priv->ysrc = 0; + ruler->priv->xsrc = 0; + ruler->priv->ysrc = 0; } #define __GTK_DATABOX_RULER_C__ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.h libgtkdatabox-0.9.2.0/gtk/gtkdatabox_ruler.h --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.h 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_ruler.h 2012-10-03 19:28:52.000000000 +0000 @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* @@ -47,7 +47,7 @@ * * * - * In the vertical orientation, the labels are rotated 90° (instead of being written + * In the vertical orientation, the labels are rotated 90° (instead of being written * as a vertical column of horizontal characters). This increases readability. * * @@ -61,6 +61,9 @@ #ifndef __GTK_DATABOX_RULER_H__ #define __GTK_DATABOX_RULER_H__ +#ifdef _MSC_VER +#define log2(x) (log(x)/log(2)) +#endif #include #include @@ -85,7 +88,7 @@ /** * GTK_DATABOX_RULER_MAX_MAX_LENGTH * - * The maximum upper limit of label length in characters + * The maximum upper limit of label length in characters */ #define GTK_DATABOX_RULER_MAX_MAX_LENGTH 63 @@ -93,7 +96,7 @@ * GtkDataboxRulerPrivate * * A private data structure used by the #GtkDataboxRuler. It shields all internal things - * from developers who are just using the object. + * from developers who are just using the object. * **/ typedef struct _GtkDataboxRulerPrivate GtkDataboxRulerPrivate; @@ -131,11 +134,47 @@ GtkDataboxScaleType gtk_databox_ruler_get_scale_type (GtkDataboxRuler * ruler); - void gtk_databox_ruler_set_orientation (GtkDataboxRuler * ruler, - GtkOrientation orientation); + void gtk_databox_ruler_set_orientation (GtkDataboxRuler * ruler, GtkOrientation orientation); + GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler *ruler); - GtkOrientation gtk_databox_ruler_get_orientation (GtkDataboxRuler * - ruler); + void gtk_databox_ruler_set_text_orientation (GtkDataboxRuler * ruler, GtkOrientation orientation); + GtkOrientation gtk_databox_ruler_get_text_orientation (GtkDataboxRuler *ruler); + + void gtk_databox_ruler_set_text_alignment (GtkDataboxRuler * ruler, PangoAlignment alignment); + PangoAlignment gtk_databox_ruler_get_text_alignment (GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_text_hoffset (GtkDataboxRuler * ruler,gint offset); + gint gtk_databox_ruler_get_text_hoffset (GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_draw_ticks(GtkDataboxRuler * ruler, gboolean draw); + gboolean gtk_databox_ruler_get_draw_ticks(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_draw_position(GtkDataboxRuler * ruler, gboolean draw); + gboolean gtk_databox_ruler_get_draw_position(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_draw_subticks(GtkDataboxRuler * ruler, gboolean draw); + gboolean gtk_databox_ruler_get_draw_subticks(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_invert_edge(GtkDataboxRuler * ruler, gboolean invert); + gboolean gtk_databox_ruler_get_invert_edge(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_linear_label_format(GtkDataboxRuler * ruler, gchar *format); + void gtk_databox_ruler_set_log_label_format(GtkDataboxRuler * ruler, gchar *format); + + gchar* gtk_databox_ruler_get_linear_label_format(GtkDataboxRuler * ruler); + gchar* gtk_databox_ruler_get_log_label_format(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_manual_ticks(GtkDataboxRuler * ruler, gfloat* manual_ticks); + gfloat* gtk_databox_ruler_get_manual_ticks(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_manual_tick_cnt(GtkDataboxRuler * ruler, guint manual_tick_cnt); + guint gtk_databox_ruler_get_manual_tick_cnt(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_manual_tick_labels(GtkDataboxRuler * ruler, gchar *labels[]); + gchar ** gtk_databox_ruler_get_manual_tick_labels(GtkDataboxRuler * ruler); + + void gtk_databox_ruler_set_box_shadow(GtkDataboxRuler * ruler, GtkShadowType which_shadow); + GtkShadowType gtk_databox_ruler_get_box_shadow(GtkDataboxRuler * ruler); G_END_DECLS #endif /* __GTK_DATABOX_RULER_H__ */ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_xyc_graph.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_xyc_graph.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_xyc_graph.c 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_xyc_graph.c 2012-10-03 19:28:52.000000000 +0000 @@ -6,12 +6,12 @@ * 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 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 Lesser 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. @@ -39,7 +39,6 @@ guint len; gfloat *X; gfloat *Y; - GdkPoint *xyc_graph; }; static gpointer parent_class = NULL; @@ -111,7 +110,7 @@ } } -/** +/** * gtk_databox_xyc_graph_get_X: * @xyc_graph: A #GtkDataboxXYCGraph object * @@ -127,7 +126,7 @@ return xyc_graph->priv->X; } -/** +/** * gtk_databox_xyc_graph_get_Y: * @xyc_graph: A #GtkDataboxXYCGraph object * @@ -143,7 +142,7 @@ return xyc_graph->priv->Y; } -/** +/** * gtk_databox_xyc_graph_get_length: * @xyc_graph: A #GtkDataboxXYCGraph object * @@ -196,7 +195,6 @@ { GtkDataboxXYCGraph *xyc_graph = GTK_DATABOX_XYC_GRAPH (object); - g_free (xyc_graph->priv->xyc_graph); g_free (xyc_graph->priv); /* Chain up to the parent class */ diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_xyyc_graph.c libgtkdatabox-0.9.2.0/gtk/gtkdatabox_xyyc_graph.c --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_xyyc_graph.c 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_xyyc_graph.c 2012-10-03 19:28:52.000000000 +0000 @@ -0,0 +1,368 @@ +/* $Id: gtkdatabox_xyyc_graph.c 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 1998 - 2008 Dr. Roland Bock + * Copyright (C) 2012 Dr. Matt Flax + * + * This program 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 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 Lesser 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. + */ + +#include + +static gint gtk_databox_xyyc_graph_real_calculate_extrema (GtkDataboxGraph * + xyyc_graph, + gfloat * min_x, + gfloat * max_x, + gfloat * min_y, + gfloat * max_y); + +/* IDs of properties */ +enum +{ + PROP_X = 1, + PROP_Y1, + PROP_Y2, + PROP_LEN +}; + +struct _GtkDataboxXYYCGraphPrivate +{ + guint len; + gfloat *X; + gfloat *Y1; + gfloat *Y2; +}; + +static gpointer parent_class = NULL; + +static void +gtk_databox_xyyc_graph_set_X (GtkDataboxXYYCGraph * xyyc_graph, gfloat * X) +{ + g_return_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph)); + g_return_if_fail (X); + + xyyc_graph->priv->X = X; + + g_object_notify (G_OBJECT (xyyc_graph), "X-Values"); +} + +static void +gtk_databox_xyyc_graph_set_Y1 (GtkDataboxXYYCGraph * xyyc_graph, gfloat * Y1) +{ + g_return_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph)); + g_return_if_fail (Y1); + + xyyc_graph->priv->Y1 = Y1; + + g_object_notify (G_OBJECT (xyyc_graph), "Y1-Values"); +} + +static void +gtk_databox_xyyc_graph_set_Y2 (GtkDataboxXYYCGraph * xyyc_graph, gfloat * Y2) +{ + g_return_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph)); + g_return_if_fail (Y2); + + xyyc_graph->priv->Y2 = Y2; + + g_object_notify (G_OBJECT (xyyc_graph), "Y2-Values"); +} + +static void +gtk_databox_xyyc_graph_set_length (GtkDataboxXYYCGraph * xyyc_graph, guint len) +{ + g_return_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph)); + g_return_if_fail (len > 0); + + xyyc_graph->priv->len = len; + + g_object_notify (G_OBJECT (xyyc_graph), "length"); +} + +static void +gtk_databox_xyyc_graph_set_property (GObject * object, + guint property_id, + const GValue * value, GParamSpec * pspec) +{ + GtkDataboxXYYCGraph *xyyc_graph = GTK_DATABOX_XYYC_GRAPH (object); + + switch (property_id) + { + case PROP_X: + { + gtk_databox_xyyc_graph_set_X (xyyc_graph, + (gfloat *) g_value_get_pointer (value)); + } + break; + case PROP_Y1: + { + gtk_databox_xyyc_graph_set_Y1 (xyyc_graph, + (gfloat *) g_value_get_pointer (value)); + } + break; + case PROP_Y2: + { + gtk_databox_xyyc_graph_set_Y2 (xyyc_graph, + (gfloat *) g_value_get_pointer (value)); + } + break; + case PROP_LEN: + { + gtk_databox_xyyc_graph_set_length (xyyc_graph, + g_value_get_int (value)); + } + break; + default: + /* We don't have any other property... */ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +/** + * gtk_databox_xyyc_graph_get_X: + * @xyyc_graph: A #GtkDataboxXYYCGraph object + * + * Gets the X values of the @xzc_graph. + * + * Return value: Pointer to X values + */ +gfloat * +gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph * xyyc_graph) +{ + g_return_val_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph), NULL); + + return xyyc_graph->priv->X; +} + +/** + * gtk_databox_xyyc_graph_get_Y1: + * @xyyc_graph: A #GtkDataboxXYYCGraph object + * + * Gets the Y1 values of the @xzc_graph. + * + * Return value: Pointer to Y1 values + */ +gfloat * +gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph * xyyc_graph) +{ + g_return_val_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph), NULL); + + return xyyc_graph->priv->Y1; +} + +/** + * gtk_databox_xyyc_graph_get_Y2: + * @xyyc_graph: A #GtkDataboxXYYCGraph object + * + * Gets the Y2 values of the @xzc_graph. + * + * Return value: Pointer to Y2 values + */ +gfloat * +gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph * xyyc_graph) +{ + g_return_val_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph), NULL); + + return xyyc_graph->priv->Y2; +} + +/** + * gtk_databox_xyyc_graph_get_length: + * @xyyc_graph: A #GtkDataboxXYYCGraph object + * + * Gets the the length of the X and Y values arrays. + * + * Return value: Length of X/Y arrays. + */ +guint +gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph * xyyc_graph) +{ + g_return_val_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (xyyc_graph), 0); + + return xyyc_graph->priv->len; +} + +static void +gtk_databox_xyyc_graph_get_property (GObject * object, + guint property_id, + GValue * value, GParamSpec * pspec) +{ + GtkDataboxXYYCGraph *xyyc_graph = GTK_DATABOX_XYYC_GRAPH (object); + + switch (property_id) + { + case PROP_X: + { + g_value_set_pointer (value, gtk_databox_xyyc_graph_get_X (xyyc_graph)); + } + break; + case PROP_Y1: + { + g_value_set_pointer (value, gtk_databox_xyyc_graph_get_Y1 (xyyc_graph)); + } + break; + case PROP_Y2: + { + g_value_set_pointer (value, gtk_databox_xyyc_graph_get_Y2 (xyyc_graph)); + } + break; + case PROP_LEN: + { + g_value_set_int (value, + gtk_databox_xyyc_graph_get_length (xyyc_graph)); + } + break; + default: + /* We don't have any other property... */ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +xyyc_graph_finalize (GObject * object) +{ + GtkDataboxXYYCGraph *xyyc_graph = GTK_DATABOX_XYYC_GRAPH (object); + + g_free (xyyc_graph->priv); + + /* Chain up to the parent class */ + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +gtk_databox_xyyc_graph_class_init (gpointer g_class + /*, gpointer g_class_data */ ) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); + GtkDataboxGraphClass *graph_class = GTK_DATABOX_GRAPH_CLASS (g_class); + GtkDataboxXYYCGraphClass *klass = GTK_DATABOX_XYYC_GRAPH_CLASS (g_class); + GParamSpec *xyyc_graph_param_spec; + + parent_class = g_type_class_peek_parent (klass); + + gobject_class->set_property = gtk_databox_xyyc_graph_set_property; + gobject_class->get_property = gtk_databox_xyyc_graph_get_property; + gobject_class->finalize = xyyc_graph_finalize; + + xyyc_graph_param_spec = g_param_spec_pointer ("X-Values", + "X coordinates", + "X values of data", + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE); + + g_object_class_install_property (gobject_class, + PROP_X, xyyc_graph_param_spec); + + xyyc_graph_param_spec = g_param_spec_pointer ("Y1-Values", + "Y1 coordinates", + "Y1 values of data", + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE); + + g_object_class_install_property (gobject_class, + PROP_Y1, xyyc_graph_param_spec); + + xyyc_graph_param_spec = g_param_spec_pointer ("Y2-Values", + "Y2 coordinates", + "Y2 values of data", + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE); + + g_object_class_install_property (gobject_class, + PROP_Y2, xyyc_graph_param_spec); + + xyyc_graph_param_spec = g_param_spec_int ("length", "length of X, Y1 and Y2", "number of data points", G_MININT, G_MAXINT, 0, /* default value */ + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE); + + g_object_class_install_property (gobject_class, + PROP_LEN, xyyc_graph_param_spec); + + graph_class->calculate_extrema = + gtk_databox_xyyc_graph_real_calculate_extrema; +} + +static void +gtk_databox_xyyc_graph_instance_init (GTypeInstance * instance + /*, gpointer g_class */ ) +{ + GtkDataboxXYYCGraph *xyyc_graph = GTK_DATABOX_XYYC_GRAPH (instance); + + xyyc_graph->priv = g_new0 (GtkDataboxXYYCGraphPrivate, 1); +} + +GType +gtk_databox_xyyc_graph_get_type (void) +{ + static GType type = 0; + + if (type == 0) + { + static const GTypeInfo info = { + sizeof (GtkDataboxXYYCGraphClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_databox_xyyc_graph_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkDataboxXYYCGraph), /* instance_size */ + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_databox_xyyc_graph_instance_init, /* instance_init */ + NULL, /* value_table */ + }; + type = g_type_register_static (GTK_DATABOX_TYPE_GRAPH, + "GtkDataboxXYYCGraph", &info, 0); + } + + return type; +} + +static gint +gtk_databox_xyyc_graph_real_calculate_extrema (GtkDataboxGraph * graph, + gfloat * min_x, gfloat * max_x, + gfloat * min_y, gfloat * max_y) +{ + GtkDataboxXYYCGraph *xyyc_graph = GTK_DATABOX_XYYC_GRAPH (graph); + guint i; + + g_return_val_if_fail (GTK_DATABOX_IS_XYYC_GRAPH (graph), -1); + g_return_val_if_fail (min_x, -1); + g_return_val_if_fail (max_x, -1); + g_return_val_if_fail (min_y, -1); + g_return_val_if_fail (max_y, -1); + g_return_val_if_fail (xyyc_graph->priv->len, -1); + + *min_x = *max_x = xyyc_graph->priv->X[0]; + *min_y = *max_y = xyyc_graph->priv->Y1[0]; + + for (i = 1; i < xyyc_graph->priv->len; ++i) + { + if (xyyc_graph->priv->X[i] < *min_x) + *min_x = xyyc_graph->priv->X[i]; + else if (xyyc_graph->priv->X[i] > *max_x) + *max_x = xyyc_graph->priv->X[i]; + if (xyyc_graph->priv->Y1[i] < *min_y) + *min_y = xyyc_graph->priv->Y1[i]; + else if (xyyc_graph->priv->Y1[i] > *max_y) + *max_y = xyyc_graph->priv->Y1[i]; + if (xyyc_graph->priv->Y2[i] < *min_y) + *min_y = xyyc_graph->priv->Y2[i]; + else if (xyyc_graph->priv->Y2[i] > *max_y) + *max_y = xyyc_graph->priv->Y2[i]; + } + + return 0; +} diff -Nru libgtkdatabox-0.9.1.1/gtk/gtkdatabox_xyyc_graph.h libgtkdatabox-0.9.2.0/gtk/gtkdatabox_xyyc_graph.h --- libgtkdatabox-0.9.1.1/gtk/gtkdatabox_xyyc_graph.h 1970-01-01 00:00:00.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk/gtkdatabox_xyyc_graph.h 2012-10-03 19:28:52.000000000 +0000 @@ -0,0 +1,95 @@ +/* $Id: gtkdatabox_xyyc_graph.h 4 2008-06-22 09:19:11Z rbock $ */ +/* GtkDatabox - An extension to the gtk+ library + * Copyright (C) 1998 - 2008 Dr. Roland Bock + * + * This program 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 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 Lesser 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. + */ + +/** + * SECTION:gtkdatabox_xyyc_graph + * @short_description: An abstract anchestor for all graphs which display xyy-values (x, y1 and y2 values) in one color. + * @include: gtkdatabox_xyyc_graph.h + * @see_also: #GtkDatabox, #GtkDataboxOffsetBars + * + * GtkDataboxXYYCGraphs are an abstract class for displaying XYY-data (x, y1 and y2 values) in one color. The values for the data are represented + * as an array of X values, an array of Y1 values and an array of Y2 values. In order to actually display data, you should + * use one of the derived classes. + * + */ + +#ifndef __GTK_DATABOX_XYYC_GRAPH_H__ +#define __GTK_DATABOX_XYYC_GRAPH_H__ + +#include + +G_BEGIN_DECLS +#define GTK_DATABOX_TYPE_XYYC_GRAPH (gtk_databox_xyyc_graph_get_type ()) +#define GTK_DATABOX_XYYC_GRAPH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + GTK_DATABOX_TYPE_XYYC_GRAPH, \ + GtkDataboxXYYCGraph)) +#define GTK_DATABOX_XYYC_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + GTK_DATABOX_TYPE_XYYC_GRAPH, \ + GtkDataboxXYYCGraphClass)) +#define GTK_DATABOX_IS_XYYC_GRAPH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + GTK_DATABOX_TYPE_XYYC_GRAPH)) +#define GTK_DATABOX_IS_XYYC_GRAPH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + GTK_DATABOX_TYPE_XYYC_GRAPH)) +#define GTK_DATABOX_XYYC_GRAPH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + GTK_DATABOX_TYPE_XYYC_GRAPH, \ + GtkDataboxXYYCGraphClass)) + +/** + * GtkDataboxXYYCGraph: + * + * GtkDataboxXYYCGraphs are an abstract class for displaying XY-data in one color. The values for the data are represented + * as an array of X values and a second array of Y values. In order to actually display data, you should + * use one of the derived classes. + * + */ + typedef struct _GtkDataboxXYYCGraph GtkDataboxXYYCGraph; + + typedef struct _GtkDataboxXYYCGraphClass GtkDataboxXYYCGraphClass; + + /** + * GtkDataboxXYYCGraphPrivate + * + * A private data structure used by the #GtkDataboxXYYCGraph. It shields all internal things + * from developers who are just using the object. + * + **/ + typedef struct _GtkDataboxXYYCGraphPrivate GtkDataboxXYYCGraphPrivate; + + struct _GtkDataboxXYYCGraph + { + /*< private >*/ + GtkDataboxGraph parent; + + GtkDataboxXYYCGraphPrivate *priv; + }; + + struct _GtkDataboxXYYCGraphClass + { + GtkDataboxGraphClass parent_class; + }; + + GType gtk_databox_xyyc_graph_get_type (void); + + guint gtk_databox_xyyc_graph_get_length (GtkDataboxXYYCGraph * xyyc_graph); + gfloat *gtk_databox_xyyc_graph_get_X (GtkDataboxXYYCGraph * xyyc_graph); + gfloat *gtk_databox_xyyc_graph_get_Y1 (GtkDataboxXYYCGraph * xyyc_graph); + gfloat *gtk_databox_xyyc_graph_get_Y2 (GtkDataboxXYYCGraph * xyyc_graph); + +G_END_DECLS +#endif /* __GTK_DATABOX_XYYC_GRAPH_H__ */ diff -Nru libgtkdatabox-0.9.1.1/gtk-doc.make libgtkdatabox-0.9.2.0/gtk-doc.make --- libgtkdatabox-0.9.1.1/gtk-doc.make 2009-04-17 21:15:02.000000000 +0000 +++ libgtkdatabox-0.9.2.0/gtk-doc.make 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - fi - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi - -.PHONY : dist-hook-local docs diff -Nru libgtkdatabox-0.9.1.1/ltmain.sh libgtkdatabox-0.9.2.0/ltmain.sh --- libgtkdatabox-0.9.1.1/ltmain.sh 2009-04-19 22:07:13.000000000 +0000 +++ libgtkdatabox-0.9.2.0/ltmain.sh 2012-11-09 05:04:27.000000000 +0000 @@ -1,9 +1,9 @@ -# Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010, 2011 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. @@ -32,50 +32,57 @@ # # 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 -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --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 +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --no-warn don't display warning messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # 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 +# 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. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION="2.2.4 Debian-2.2.4-0ubuntu4" +VERSION="2.4.2 Debian-2.4.2-1ubuntu1" TIMESTAMP="" -package_revision=1.2976 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +98,15 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,24 +119,28 @@ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# 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" : ${CP="cp -f"} -: ${ECHO="echo"} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -144,6 +160,27 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -158,33 +195,183 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result } -# Generated shell functions inserted here. +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done -# 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" + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -196,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -215,6 +402,15 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -243,7 +439,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -258,18 +454,25 @@ : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -326,9 +529,9 @@ case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +581,7 @@ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +595,7 @@ { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +622,7 @@ { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -488,15 +691,39 @@ fi } - - +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,22 +736,28 @@ # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -534,11 +767,18 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" - exit $? + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,63 +786,106 @@ # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + $opt_debug + + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation +exit_cmd=: -# 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 </dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -636,16 +919,16 @@ # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -692,133 +975,6 @@ esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. -{ - - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - - # Parse non-mode specific arguments: - while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" - func_echo "enabling shell trace mode" - opt_debug='set -x' - $opt_debug - ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift - ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" - shift - ;; - - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - ;; - - --verbose| -v) preserve_args="$preserve_args $opt" - opt_silent=false - ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here - shift - ;; - - # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} - shift - ;; - - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break - ;; - esac - done - - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps - ;; - esac - - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} - # func_check_version_match # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. @@ -855,46 +1011,228 @@ } -## ----------- ## -## Main. ## -## ----------- ## +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac -$opt_help || { - # Sanity checks first: - func_check_version_match - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - test -z "$mode" && func_fatal_error "error: you must specify a MODE." +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do + opt="$1" + shift + case $opt in + --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" + $opt_debug + ;; + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" + shift + ;; + --preserve-dup-deps) + opt_preserve_dup_deps=: + ;; + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) + opt_silent=false +func_append preserve_args " $opt" + ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" + shift + ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE + # Separate optargs to long options: + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } + + + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE } + + +## ----------- ## +## Main. ## +## ----------- ## + # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 } # func_lalib_unsafe_p file @@ -907,7 +1245,7 @@ func_lalib_unsafe_p () { lalib_p=no - if test -r "$1" && exec 5<&0 <"$1"; then + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then for lalib_p_l in 1 2 3 4 do read lalib_p_line @@ -949,12 +1287,9 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1000,6 +1335,37 @@ } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # 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. @@ -1012,13 +1378,15 @@ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` 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` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1029,11 +1397,13 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1058,43 +1428,523 @@ } - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - $opt_dry_run || { - cat >${write_libobj}T < "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1348,7 +2195,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1395,11 +2242,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1444,13 +2291,13 @@ } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1481,10 +2328,11 @@ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1537,7 +2385,7 @@ The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1557,6 +2405,8 @@ -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -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) @@ -1585,6 +2435,11 @@ -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1618,18 +2473,44 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1642,13 +2523,16 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1670,7 +2554,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1711,7 +2595,7 @@ for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1727,8 +2611,7 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1753,29 +2636,66 @@ # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1785,7 +2705,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -1794,53 +2714,55 @@ # Exit here if they wanted silent mode. $opt_silent && 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\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + 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 " - 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" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." - ;; - *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - $ECHO "X----------------------------------------------------------------------" | $Xsed + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -1851,7 +2773,7 @@ # 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 + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1865,7 +2787,12 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1875,10 +2802,12 @@ install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -1886,10 +2815,9 @@ case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1903,6 +2831,10 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1913,7 +2845,11 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1922,6 +2858,13 @@ test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -1976,10 +2919,13 @@ case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -1993,23 +2939,23 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2022,9 +2968,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2042,11 +2988,11 @@ test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) tstripme="" @@ -2082,7 +3028,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2152,7 +3098,7 @@ # Do a test to see if this is really a libtool program. case $host in - *cygwin*|*mingw*) + *cygwin* | *mingw*) if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result @@ -2182,7 +3128,7 @@ if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2201,7 +3147,7 @@ file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2220,7 +3166,7 @@ } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2256,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2279,7 +3227,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2322,6 +3270,22 @@ extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2331,10 +3295,11 @@ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2358,7 +3323,7 @@ $RM $export_symbols eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in - *cygwin* | *mingw* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; @@ -2370,7 +3335,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2383,10 +3348,52 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2414,36 +3421,19 @@ if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - $ECHO >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2456,7 +3446,7 @@ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2483,7 +3473,7 @@ # 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*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2499,7 +3489,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2512,18 +3502,18 @@ # Transform the symbol file into the correct name. symfileobj="$output_objdir/${my_outputname}S.$objext" case $host in - *cygwin* | *mingw* ) + *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2537,8 +3527,8 @@ # 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 "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2548,6 +3538,7 @@ # 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. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2558,9 +3549,11 @@ win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2589,6 +3582,131 @@ $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -2597,7 +3715,18 @@ $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2668,7 +3797,7 @@ darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2683,34 +3812,30 @@ func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper arg +# func_emit_wrapper [arg=no] # -# emit a libtool wrapper script on stdout -# don't directly open a file because we may want to +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to # incorporate the script contents within a cygwin/mingw # wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variable +# func_mode_link because it depends on a number of variables # set therein. # -# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script # will assume that the directory in which it is stored is -# the '.lib' directory. This is a cygwin/mingw-specific +# the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () { - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2726,7 +3851,6 @@ # 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' # Be Bourne compatible @@ -2757,31 +3881,135 @@ 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\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED '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'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2791,8 +4019,8 @@ esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done # Usually 'no', except on cygwin/mingw when embedded into @@ -2805,7 +4033,7 @@ fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2860,6 +4088,18 @@ if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -2868,53 +4108,28 @@ # 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/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $ECHO "\ - 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 "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} 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 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } -# end: func_emit_wrapper + # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -2932,20 +4147,18 @@ This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include #include #ifdef _MSC_VER # include # include # include -# define setmode _setmode #else # include # include @@ -2962,6 +4175,44 @@ #include #include +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -2977,14 +4228,7 @@ # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3015,10 +4259,6 @@ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3031,22 +4271,13 @@ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3056,37 +4287,88 @@ int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF -static const char *script_text = + cat </dev/null || echo $SHELL` - case $lt_newargv0 in - *.exe | *.EXE) ;; - *) lt_newargv0=$lt_newargv0.exe ;; - esac - ;; - * ) lt_newargv0=$SHELL ;; - esac - fi - - cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { $opt_debug case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out # which system we are compiling for in order to pass an extra @@ -3554,6 +5133,7 @@ new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -3646,6 +5226,11 @@ esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -3677,9 +5262,9 @@ ;; *) if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" + func_append dlfiles " $arg" else - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $arg" fi prev= continue @@ -3703,7 +5288,7 @@ *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + *) func_append deplibs " $qarg.ltframework" # this is fixed later ;; esac ;; @@ -3722,7 +5307,7 @@ moreargs= for fil in `cat "$save_arg"` do -# moreargs="$moreargs $fil" +# func_append moreargs " $fil" arg=$fil # A libtool-controlled object. @@ -3751,7 +5336,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -3763,7 +5348,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -3833,12 +5418,12 @@ if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) rpath="$rpath $arg" ;; + *) func_append rpath " $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; + *) func_append xrpath " $arg" ;; esac fi prev= @@ -3850,28 +5435,28 @@ continue ;; weak) - weak_libs="$weak_libs $arg" + func_append weak_libs " $arg" prev= continue ;; xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - compiler_flags="$compiler_flags $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -3907,6 +5492,11 @@ continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -3957,8 +5547,16 @@ ;; -L*) - func_stripname '-L' '' "$arg" - dir=$func_stripname_result + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -3970,22 +5568,30 @@ ;; esac case "$deplibs " in - *" -L$dir "*) ;; + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" ;; esac case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -3995,7 +5601,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4009,7 +5615,7 @@ ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -4029,7 +5635,7 @@ ;; esac fi - deplibs="$deplibs $arg" + func_append deplibs " $arg" continue ;; @@ -4041,21 +5647,22 @@ # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) - compiler_flags="$compiler_flags $arg" + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + * ) func_append new_inherited_linker_flags " $arg" ;; esac continue ;; @@ -4072,7 +5679,7 @@ -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. func_warning "\`-no-install' is ignored for $host" @@ -4122,13 +5729,17 @@ # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac continue ;; @@ -4181,8 +5792,8 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $func_quote_for_eval_result" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4197,9 +5808,9 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$linker_flags $func_quote_for_eval_result" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4227,23 +5838,27 @@ arg="$func_quote_for_eval_result" ;; - # -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*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" continue ;; @@ -4255,7 +5870,7 @@ *.$objext) # A standard object. - objs="$objs $arg" + func_append objs " $arg" ;; *.lo) @@ -4286,7 +5901,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4298,7 +5913,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4343,24 +5958,25 @@ *.$libext) # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + func_append deplibs " $arg" + func_append old_deplibs " $arg" continue ;; *.la) # A libtool-controlled library. + func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" + func_append dlfiles " $func_resolve_sysroot_result" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $func_resolve_sysroot_result" prev= else - deplibs="$deplibs $arg" + func_append deplibs " $func_resolve_sysroot_result" fi continue ;; @@ -4398,7 +6014,7 @@ 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\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -4407,6 +6023,8 @@ func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -4427,12 +6045,12 @@ # 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 $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - libs="$libs $deplib" + func_append libs " $deplib" done if test "$linkmode" = lib; then @@ -4445,9 +6063,9 @@ if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" + func_append pre_post_deps " $pre_post_dep" done fi pre_post_deps= @@ -4517,17 +6135,19 @@ for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= + func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$lib" ;; + *.la) func_source "$func_resolve_sysroot_result" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; - *) deplibs="$deplibs $deplib" ;; + *) func_append deplibs " $deplib" ;; esac done done @@ -4543,16 +6163,17 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + func_append compiler_flags " $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -4637,7 +6258,7 @@ if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -4650,7 +6271,8 @@ test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) if test "$pass" = conv; then @@ -4664,7 +6286,8 @@ finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -4675,17 +6298,21 @@ -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - dir=$func_stripname_result + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) lib="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -4703,7 +6330,7 @@ match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -4713,15 +6340,15 @@ ;; esac if test "$valid_a_lib" != yes; then - $ECHO + 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 use here." + 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 use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -4748,11 +6375,11 @@ 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" + func_append newdlprefiles " $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - newdlfiles="$newdlfiles $deplib" + func_append newdlfiles " $deplib" fi fi continue @@ -4794,20 +6421,20 @@ # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` 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" + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi if test "$pass" = conv; then @@ -4818,30 +6445,36 @@ func_fatal_error "cannot find name of link library for \`$lib'" 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" + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done 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 -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -4858,9 +6491,9 @@ # 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" + func_append dlprefiles " $lib $dependency_libs" else - newdlfiles="$newdlfiles $lib" + func_append newdlfiles " $lib" fi continue fi # $pass = dlopen @@ -4882,14 +6515,14 @@ # 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 + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$libdir" - absdir="$libdir" + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -4897,12 +6530,12 @@ dir="$ladir" absdir="$abs_ladir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -4913,20 +6546,46 @@ if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" 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" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $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 + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac fi # $pass = dlpreopen if test -z "$libdir"; then @@ -4944,7 +6603,7 @@ if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" + func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -4957,7 +6616,8 @@ for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; esac # Need to link against all dependency_libs? @@ -4968,12 +6628,12 @@ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done # for deplib continue fi # $linkmode = prog... @@ -4988,7 +6648,7 @@ # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) temp_rpath="$temp_rpath$absdir:" ;; + *) func_append temp_rpath "$absdir:" ;; esac fi @@ -5000,7 +6660,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5009,7 +6669,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5032,14 +6692,14 @@ if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw*) + *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no ;; *) if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=yes fi ;; @@ -5056,7 +6716,7 @@ fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5074,7 +6734,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5083,7 +6743,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5102,7 +6762,7 @@ elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw*) + *cygwin* | mingw* | *cegcc*) func_arith $current - $age major=$func_arith_result versuffix="-$major" @@ -5137,7 +6797,7 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$mode" != relink; then + if test "$linkmode" = prog || test "$opt_mode" != relink; then add_shlibpath= add_dir= add= @@ -5159,9 +6819,9 @@ if test "X$dlopenmodule" != "X$lib"; 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" + 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 @@ -5188,12 +6848,12 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # 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" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5215,7 +6875,7 @@ if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -5229,13 +6889,13 @@ test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$opt_mode" = relink; then add_shlibpath= add_dir= add= @@ -5249,7 +6909,7 @@ elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -5266,7 +6926,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5301,21 +6961,21 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + 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." + 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." + 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." + 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 @@ -5343,37 +7003,46 @@ temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; + *) func_append xrpath " $temp_xrpath";; esac;; - *) temp_deplibs="$temp_deplibs $libdir";; + *) func_append temp_deplibs " $libdir";; esac done dependency_libs="$temp_deplibs" fi - newlib_search_path="$newlib_search_path $absdir" + func_append 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 $opt_duplicate_deps ; then + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $func_resolve_sysroot_result" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -5400,8 +7069,8 @@ if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -5434,7 +7103,7 @@ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -5451,7 +7120,7 @@ for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; + *) func_append lib_search_path " $dir" ;; esac done newlib_search_path= @@ -5509,10 +7178,10 @@ -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -5528,7 +7197,7 @@ ;; esac if test -n "$i" ; then - tmp_libs="$tmp_libs $i" + func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs @@ -5569,7 +7238,7 @@ # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - objs="$objs$old_deplibs" + func_append objs "$old_deplibs" ;; lib) @@ -5602,10 +7271,10 @@ if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + func_append libobjs " $objs" fi fi @@ -5664,13 +7333,14 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -5783,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -5806,7 +7476,7 @@ done # Make executables depend on our current version. - verstring="$verstring:${current}.0" + func_append verstring ":${current}.0" ;; qnx) @@ -5874,17 +7544,17 @@ fi func_generate_dlsyms "$libname" "$libname" "yes" - libobjs="$libobjs $symfileobj" + func_append libobjs " $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$mode" != relink; then + if test "$opt_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) + *.$objext | *.gcno) ;; $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) if test "X$precious_files_regex" != "X"; then @@ -5893,7 +7563,7 @@ continue fi fi - removelist="$removelist $p" + func_append removelist " $p" ;; *) ;; esac @@ -5904,27 +7574,28 @@ # 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" + func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "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" + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -5938,7 +7609,7 @@ for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; + *) func_append dlfiles " $lib" ;; esac done @@ -5948,19 +7619,19 @@ for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; + *) func_append dlprefiles " $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -5977,7 +7648,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" + func_append deplibs " -lc" fi ;; esac @@ -6026,7 +7697,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6037,21 +7708,21 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $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 I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + 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 I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6069,7 +7740,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6080,29 +7751,29 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $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 a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + 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 a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + 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 "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + 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 ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6119,15 +7790,27 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` + if test -n "$file_magic_glob"; then + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` + else + libnameglob=$libname + fi + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -6144,13 +7827,13 @@ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6159,12 +7842,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + 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" + 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 @@ -6175,7 +7858,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -6191,7 +7874,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -6202,9 +7885,9 @@ 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 \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6213,12 +7896,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + 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" + 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 @@ -6229,32 +7912,32 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; 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" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6266,23 +7949,23 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + 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." + 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." + 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" @@ -6292,16 +7975,16 @@ 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." + 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." + 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 @@ -6318,9 +8001,9 @@ # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6333,7 +8016,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -6343,10 +8026,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -6358,15 +8041,22 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac 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" + test "$opt_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 + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -6375,18 +8065,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -6394,17 +8084,13 @@ 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 + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" 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:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -6412,7 +8098,7 @@ fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -6438,23 +8124,23 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= case $host_os in - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile if test "x`$SED 1q $export_symbols`" != xEXPORTS; then @@ -6480,13 +8166,45 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -6508,7 +8226,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -6520,7 +8238,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -6530,7 +8248,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -6550,21 +8268,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= 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" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -6609,7 +8327,8 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -6622,13 +8341,16 @@ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - $ECHO ')' >> $output - delfiles="$delfiles $output" + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -6642,10 +8364,12 @@ fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -6669,17 +8393,19 @@ # 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\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -6689,11 +8415,12 @@ # 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\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -6727,7 +8454,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -6748,7 +8475,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -6760,7 +8487,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -6801,10 +8528,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -6820,7 +8547,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -6832,7 +8559,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -6913,18 +8640,21 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # 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 + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -6984,8 +8714,8 @@ 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 / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -6996,14 +8726,14 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7017,7 +8747,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7027,17 +8757,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7045,7 +8775,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7064,30 +8794,32 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7113,18 +8845,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -7138,8 +8870,8 @@ 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` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7151,6 +8883,10 @@ wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7164,13 +8900,19 @@ esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -7193,7 +8935,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7201,7 +8943,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7211,11 +8953,18 @@ # 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'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -7230,7 +8979,7 @@ 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 "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7242,13 +8991,19 @@ fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -7266,18 +9021,7 @@ 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"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7308,11 +9052,10 @@ func_emit_cwrapperexe_src > $cwrappersource - # 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. + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. $opt_dry_run || { $LTCC $LTCFLAGS -o $cwrapper $cwrappersource $STRIP $cwrapper @@ -7358,7 +9101,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -7366,10 +9109,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -7380,10 +9123,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -7399,9 +9142,9 @@ done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -7425,18 +9168,30 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -7510,7 +9265,7 @@ 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 "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -7530,12 +9285,23 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -7549,9 +9315,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -7568,7 +9334,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -7580,7 +9346,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -7589,15 +9355,33 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -7656,7 +9440,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -7676,9 +9460,9 @@ for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -7687,24 +9471,23 @@ rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -7730,18 +9513,17 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -7769,19 +9551,19 @@ # 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" + func_append 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" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -7791,7 +9573,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -7800,7 +9582,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -7808,12 +9590,12 @@ # 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}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -7821,7 +9603,6 @@ esac func_show_eval "$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 @@ -7833,16 +9614,16 @@ exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd"