+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
+Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am gtk-config.in l*: Update to libtool-1.2b,
+ change library versioning scheme to drop LT_RELEASE
+ from the -l line, while keeping it in the soname.
+
+Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in Makefile.in: define a MAINT-like variable REBUILD
+ which is set if Perl and awk are found, and autogenerated sources
+ can be rebuilt. Remove the auto-generated sources from
+ CVS.
+
+ Add dependencies so that the autogenerated sources are
+ rebuilt if the files they depend on change.
+ (This unfortunately currently results in the entire
+ gtk/ directory being rebuilt when any header changes.
+ Moving all enums to gtkenums.h would fix this.)
+
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
-- the widget argument is NULL for the first radio button in the
group.
+>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
#
# 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
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
i*:CYGWIN*:*)
- echo i386-pc-cygwin32
+ echo ${UNAME_MACHINE}-pc-cygwin32
exit 0 ;;
i*:MINGW*:*)
- echo i386-pc-mingw32
+ echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin32
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
+ # uname on the ARM produces all sorts of strangeness, and we need to
+ # filter it out.
+ case "$UNAME_MACHINE" in
+ arm* | sa110*) UNAME_MACHINE="arm" ;;
+ esac
+
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+ armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
esac
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
- i[3456]86)
+ i[34567]86)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
exit 1
;;
# Recognize the basic CPU types with company name.
- vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[3456]86v32)
+ i[34567]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
- i[3456]86v4*)
+ i[34567]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
- i[3456]86v)
+ i[34567]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
- i[3456]86sol2)
+ i[34567]86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5)
- basic_machine=i586-intel
+ pentium | p5 | k5 | nexen)
+ basic_machine=i586-pc
;;
- pentiumpro | p6)
- basic_machine=i686-intel
+ pentiumpro | p6 | k6 | 6x86)
+ basic_machine=i686-pc
;;
- pentium-* | p5-*)
+ pentiumii | pentium2)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumpro-* | p6-*)
+ pentiumpro-* | p6-* | k6-* | 6x86-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- k5)
- # We don't have specific support for AMD's K5 yet, so just call it a Pentium
- basic_machine=i586-amd
- ;;
- nexen)
- # We don't have specific support for Nexgen yet, so just call it a Pentium
- basic_machine=i586-nexgen
+ pentiumii-* | pentium2-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
fi
fi
-dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
+
+AC_PROG_AWK
+AC_CHECK_PROGS(PERL, perl5 perl)
+
+REBUILD=\#
+if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
+ if test -n "$AWK" ; then
+ REBUILD=
+ fi
+fi
+AC_SUBST(REBUILD)
+
+dnl The DU4 header files don't provide library prototypes unless
+dnl -std1 is given to the native cc.
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
+
gtk_save_LIBS=$LIBS
LIBS="$LIBS -lm"
AC_TRY_RUN([#include <math.h>
gdkincludedir = $(includedir)/gdk
-lib_LTLIBRARIES = libgdk-1.1.la
+lib_LTLIBRARIES = libgdk.la
DEFS += -DG_LOG_DOMAIN=\"Gdk\"
-libgdk_1_1_la_SOURCES = \
+libgdk_la_SOURCES = \
gdk.c \
gdkcc.c \
gdkcolor.c \
gdktypes.h \
gdkx.h
-libgdk_1_1_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- @x_ldflags@ @x_libs@
+libgdk_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
+ @x_ldflags@ @x_libs@
INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
fi
fi
done
- echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @x_libs@ -lm
+ echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ -lm
;;
*)
echo "${usage}" 1>&2
gtkincludedir = $(includedir)/gtk
DEFS += -DG_LOG_DOMAIN=\"Gtk\"
-lib_LTLIBRARIES = libgtk-1.1.la
+lib_LTLIBRARIES = libgtk.la
-libgtk_1_1_la_SOURCES = \
+libgtk_la_SOURCES = \
gtkaccelgroup.c \
gtkaccellabel.c \
gtkadjustment.c \
fnmatch.c \
fnmatch.h
-gtkinclude_HEADERS = \
+# Source headers are are non-autogenerated headers
+source_headers = \
gtk.h \
gtkaccelgroup.h \
gtkaccellabel.h \
gtklist.h \
gtklistitem.h \
gtkmain.h \
- gtkmarshal.h \
gtkmenu.h \
gtkmenubar.h \
gtkmenufactory.h \
gtkvscrollbar.h \
gtkvseparator.h \
gtkwidget.h \
- gtkwindow.h \
+ gtkwindow.h
+
+gtkinclude_HEADERS = \
+ $(source_headers) \
+ gtkmarshal.h \
gtktypebuiltins.h
-.PHONY: auto-files auto-files-1
-auto-files:
- rm -f $(srcdir)/gtk.defs
- $(MAKE) auto-files-1
+BUILT_SOURCES = \
+ gtktypebuiltins.h \
+ gtktypebuiltins_evals.c \
+ gtktypebuiltins_ids.c \
+ gtktypebuiltins_vars.c \
+ gtkmarshal.c \
+ gtkmarshal.h
-auto-files-1: gtk.defs
-auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c
-auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h
+# More headers to use when autogenerating.
+gdk_headers = \
+ $(top_srcdir)/gdk/gdktypes.h \
+ $(top_srcdir)/gdk/gdkrgb.h
# generate gtk.defs file from gtk-boxed.defs and *.h
-gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs
+gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+ src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%` ; \
srcdir=$(srcdir) \
- perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \
- $(top_srcdir)/gdk/gdk*.h > gd.tmp
+ perl $(srcdir)/makeenums.pl defs $$src_headers \
+ $(gdk_headers) > gd.tmp
cat $(srcdir)/gtk-boxed.defs >> gd.tmp
cp gd.tmp $(srcdir)/gtk.defs
rm -f gd.tmp
# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
cp gtb.tmp $(srcdir)/gtktypebuiltins.h
rm -f gtb.tmp
# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
rm -f gtbv.tmp
# generate type entries for type-id registration
-gtktypebuiltins_ids.c: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
rm -f gtbi.tmp
# generate enum value arrays
-gtktypebuiltins_evals.c: @MAINT@ makeenums.pl gtk.defs
+gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
srcdir=$(srcdir) \
perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
$(top_srcdir)/gdk/gdk*.h > gtbe.tmp
cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
rm -f gtbe.tmp
-gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list genmarshal.pl
+gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl
# ???
# special remake rules
-makeenums.h: @MAINT@ gtk.h gtkprivate.h
+# makeenums.h: @REBUILD@ gtk.h gtkprivate.h
-libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libgtk_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
EXTRA_DIST = \
line-arrow.xbm \
noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple
-# FIXME, we currently rely on linking against libglib-1.1
-
DEPS = \
- libgtk-@LT_RELEASE@.la \
- $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la
+ libgtk.la \
+ $(top_builddir)/gdk/libgdk.la
LDADDS = \
- libgtk-@LT_RELEASE@.la \
- $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la \
+ libgtk.la \
+ $(top_builddir)/gdk/libgdk.la \
@x_ldflags@ \
@x_libs@ \
@GLIB_LIBS@ \
;; generated by makeenums.pl ; -*- scheme -*-
-; enumerations from "./gtkclist.h"
+; enumerations from "gtkclist.h"
(define-enum GtkCellType
(empty GTK_CELL_EMPTY)
(pixtext GTK_CELL_PIXTEXT)
(widget GTK_CELL_WIDGET))
-; enumerations from "./gtkctree.h"
+; enumerations from "gtkctree.h"
(define-enum GtkCTreePos
(before GTK_CTREE_POS_BEFORE)
(toggle GTK_CTREE_EXPANSION_TOGGLE)
(toggle-recursive GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE))
-; enumerations from "./gtkdebug.h"
+; enumerations from "gtkdebug.h"
(define-flags GtkDebugFlag
(objects GTK_DEBUG_OBJECTS)
(misc GTK_DEBUG_MISC)
(signals GTK_DEBUG_SIGNALS))
-; enumerations from "./gtkenums.h"
+; enumerations from "gtkenums.h"
(define-flags GtkAccelFlags
(visible GTK_ACCEL_VISIBLE)
(ascending GTK_SORT_ASCENDING)
(descending GTK_SORT_DESCENDING))
-; enumerations from "./gtkfontsel.h"
+; enumerations from "gtkfontsel.h"
(define-enum GtkFontMetricType
(ixels-metric PIXELS_METRIC)
(oints-metric POINTS_METRIC))
-; enumerations from "./gtkobject.h"
+; enumerations from "gtkobject.h"
(define-flags GtkObjectFlags
(destroyed GTK_DESTROYED)
(mask GTK_ARG_MASK)
(readwrite GTK_ARG_READWRITE))
-; enumerations from "./gtkpacker.h"
+; enumerations from "gtkpacker.h"
(define-flags GtkPackerOptions
(expand GTK_PACK_EXPAND)
(w GTK_ANCHOR_W)
(e GTK_ANCHOR_E))
-; enumerations from "./gtkprivate.h"
+; enumerations from "gtkprivate.h"
(define-flags GtkPrivateFlags
(user-style PRIVATE_GTK_USER_STYLE)
(has-shape-mask PRIVATE_GTK_HAS_SHAPE_MASK)
(in-reparent PRIVATE_GTK_IN_REPARENT))
-; enumerations from "./gtkprogressbar.h"
+; enumerations from "gtkprogressbar.h"
(define-enum GtkProgressBarStyle
(continuous GTK_PROGRESS_CONTINUOUS)
(bottom-to-top GTK_PROGRESS_BOTTOM_TO_TOP)
(top-to-bottom GTK_PROGRESS_TOP_TO_BOTTOM))
-; enumerations from "./gtkrc.h"
+; enumerations from "gtkrc.h"
(define-enum GtkRcTokenType
(invalid GTK_RC_TOKEN_INVALID)
(highest GTK_RC_TOKEN_HIGHEST)
(last GTK_RC_TOKEN_LAST))
-; enumerations from "./gtkspinbutton.h"
+; enumerations from "gtkspinbutton.h"
(define-enum GtkSpinButtonUpdatePolicy
(always GTK_UPDATE_ALWAYS)
(end GTK_SPIN_END)
(user-defined GTK_SPIN_USER_DEFINED))
-; enumerations from "./gtktoolbar.h"
+; enumerations from "gtktoolbar.h"
(define-enum GtkToolbarChildType
(space GTK_TOOLBAR_CHILD_SPACE)
(radiobutton GTK_TOOLBAR_CHILD_RADIOBUTTON)
(widget GTK_TOOLBAR_CHILD_WIDGET))
-; enumerations from "./gtktree.h"
+; enumerations from "gtktree.h"
(define-enum GtkTreeViewMode
(line GTK_TREE_VIEW_LINE)
(item GTK_TREE_VIEW_ITEM))
-; enumerations from "./gtktypeutils.h"
+; enumerations from "gtktypeutils.h"
(define-enum GtkFundamentalType
(invalid GTK_TYPE_INVALID)
(foreign GTK_TYPE_FOREIGN)
(object GTK_TYPE_OBJECT))
-; enumerations from "./gtkwidget.h"
+; enumerations from "gtkwidget.h"
(define-flags GtkWidgetFlags
(toplevel GTK_TOPLEVEL)
(composite-child GTK_COMPOSITE_CHILD)
(basic GTK_BASIC))
-; enumerations from "../gdk/gdkprivate.h"
-
-(define-flags GdkColorInfoFlags
- (writeable GDK_COLOR_WRITEABLE))
-
-(define-flags GdkDebugFlag
- (misc GDK_DEBUG_MISC)
- (events GDK_DEBUG_EVENTS)
- (dnd GDK_DEBUG_DND)
- (color-context GDK_DEBUG_COLOR_CONTEXT)
- (xim GDK_DEBUG_XIM))
-
-; enumerations from "../gdk/gdkrgb.h"
-
-(define-enum GdkRgbDither
- (none GDK_RGB_DITHER_NONE)
- (normal GDK_RGB_DITHER_NORMAL)
- (max GDK_RGB_DITHER_MAX))
-
; enumerations from "../gdk/gdktypes.h"
(define-enum GdkWindowType
(in GDK_OVERLAP_RECTANGLE_IN)
(out GDK_OVERLAP_RECTANGLE_OUT)
(part GDK_OVERLAP_RECTANGLE_PART))
+
+; enumerations from "../gdk/gdkrgb.h"
+
+(define-enum GdkRgbDither
+ (none GDK_RGB_DITHER_NONE)
+ (normal GDK_RGB_DITHER_NORMAL)
+ (max GDK_RGB_DITHER_MAX))
;; -*- scheme -*-
+++ /dev/null
-#include "gtkmarshal.h"
-
-typedef gboolean (*GtkSignal_BOOL__NONE) (GtkObject * object,
- gpointer user_data);
-void
-gtk_marshal_BOOL__NONE (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_BOOL__NONE rfunc;
- gboolean *return_val;
- return_val = GTK_RETLOC_BOOL (args[0]);
- rfunc = (GtkSignal_BOOL__NONE) func;
- *return_val = (*rfunc) (object,
- func_data);
-}
-
-typedef gboolean (*GtkSignal_BOOL__POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer user_data);
-void
-gtk_marshal_BOOL__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_BOOL__POINTER rfunc;
- gboolean *return_val;
- return_val = GTK_RETLOC_BOOL (args[1]);
- rfunc = (GtkSignal_BOOL__POINTER) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
-}
-
-typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_INT_INT) (GtkObject * object,
- gpointer arg1,
- gpointer arg2,
- gint arg3,
- gint arg4,
- gpointer user_data);
-void
-gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_BOOL__POINTER_POINTER_INT_INT rfunc;
- gboolean *return_val;
- return_val = GTK_RETLOC_BOOL (args[4]);
- rfunc = (GtkSignal_BOOL__POINTER_POINTER_INT_INT) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_INT (args[2]),
- GTK_VALUE_INT (args[3]),
- func_data);
-}
-
-typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer arg2,
- gpointer arg3,
- gpointer arg4,
- gpointer user_data);
-void
-gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER rfunc;
- gboolean *return_val;
- return_val = GTK_RETLOC_BOOL (args[4]);
- rfunc = (GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_POINTER (args[2]),
- GTK_VALUE_POINTER (args[3]),
- func_data);
-}
-
-typedef gint (*GtkSignal_INT__INT) (GtkObject * object,
- gint arg1,
- gpointer user_data);
-void
-gtk_marshal_INT__INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_INT__INT rfunc;
- gint *return_val;
- return_val = GTK_RETLOC_INT (args[1]);
- rfunc = (GtkSignal_INT__INT) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- func_data);
-}
-
-typedef gint (*GtkSignal_INT__POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer user_data);
-void
-gtk_marshal_INT__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_INT__POINTER rfunc;
- gint *return_val;
- return_val = GTK_RETLOC_INT (args[1]);
- rfunc = (GtkSignal_INT__POINTER) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
-}
-
-typedef gint (*GtkSignal_INT__POINTER_CHAR_CHAR) (GtkObject * object,
- gpointer arg1,
- char arg2,
- char arg3,
- gpointer user_data);
-void
-gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_INT__POINTER_CHAR_CHAR rfunc;
- gint *return_val;
- return_val = GTK_RETLOC_INT (args[3]);
- rfunc = (GtkSignal_INT__POINTER_CHAR_CHAR) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_CHAR (args[1]),
- GTK_VALUE_CHAR (args[2]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__BOOL) (GtkObject * object,
- gboolean arg1,
- gpointer user_data);
-void
-gtk_marshal_NONE__BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__BOOL rfunc;
- rfunc = (GtkSignal_NONE__BOOL) func;
- (*rfunc) (object,
- GTK_VALUE_BOOL (args[0]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer user_data);
-void
-gtk_marshal_NONE__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__POINTER rfunc;
- rfunc = (GtkSignal_NONE__POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__C_CALLBACK) (GtkObject * object,
- gpointer arg1a,
- gpointer arg1b,
- gpointer user_data);
-void
-gtk_marshal_NONE__C_CALLBACK (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__C_CALLBACK rfunc;
- rfunc = (GtkSignal_NONE__C_CALLBACK) func;
- (*rfunc) (object,
- GTK_VALUE_C_CALLBACK (args[0]).func,
- GTK_VALUE_C_CALLBACK (args[0]).func_data,
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__C_CALLBACK_C_CALLBACK) (GtkObject * object,
- gpointer arg1a,
- gpointer arg1b,
- gpointer arg2a,
- gpointer arg2b,
- gpointer user_data);
-void
-gtk_marshal_NONE__C_CALLBACK_C_CALLBACK (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__C_CALLBACK_C_CALLBACK rfunc;
- rfunc = (GtkSignal_NONE__C_CALLBACK_C_CALLBACK) func;
- (*rfunc) (object,
- GTK_VALUE_C_CALLBACK (args[0]).func,
- GTK_VALUE_C_CALLBACK (args[0]).func_data,
- GTK_VALUE_C_CALLBACK (args[1]).func,
- GTK_VALUE_C_CALLBACK (args[1]).func_data,
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT) (GtkObject * object,
- gint arg1,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT rfunc;
- rfunc = (GtkSignal_NONE__INT) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_FLOAT) (GtkObject * object,
- gint arg1,
- gfloat arg2,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_FLOAT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_FLOAT rfunc;
- rfunc = (GtkSignal_NONE__INT_FLOAT) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_FLOAT (args[1]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_FLOAT_BOOL) (GtkObject * object,
- gint arg1,
- gfloat arg2,
- gboolean arg3,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_FLOAT_BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_FLOAT_BOOL rfunc;
- rfunc = (GtkSignal_NONE__INT_FLOAT_BOOL) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_FLOAT (args[1]),
- GTK_VALUE_BOOL (args[2]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT) (GtkObject * object,
- gint arg1,
- gint arg2,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_INT rfunc;
- rfunc = (GtkSignal_NONE__INT_INT) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_INT (args[1]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER) (GtkObject * object,
- gint arg1,
- gint arg2,
- gpointer arg3,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_INT_POINTER rfunc;
- rfunc = (GtkSignal_NONE__INT_INT_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__NONE) (GtkObject * object,
- gpointer user_data);
-void
-gtk_marshal_NONE__NONE (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__NONE rfunc;
- rfunc = (GtkSignal_NONE__NONE) func;
- (*rfunc) (object,
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_INT) (GtkObject * object,
- gpointer arg1,
- gint arg2,
- gpointer user_data);
-void
-gtk_marshal_NONE__POINTER_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__POINTER_INT rfunc;
- rfunc = (GtkSignal_NONE__POINTER_INT) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_INT (args[1]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer arg2,
- gpointer user_data);
-void
-gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__POINTER_POINTER rfunc;
- rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_POINTER (args[1]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_POINTER_POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer arg2,
- gpointer arg3,
- gpointer user_data);
-void
-gtk_marshal_NONE__POINTER_POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__POINTER_POINTER_POINTER rfunc;
- rfunc = (GtkSignal_NONE__POINTER_POINTER_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_INT_INT) (GtkObject * object,
- gpointer arg1,
- gint arg2,
- gint arg3,
- gpointer user_data);
-void
-gtk_marshal_NONE__POINTER_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__POINTER_INT_INT rfunc;
- rfunc = (GtkSignal_NONE__POINTER_INT_INT) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_INT (args[2]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_INT_POINTER) (GtkObject * object,
- gpointer arg1,
- gint arg2,
- gpointer arg3,
- gpointer user_data);
-void
-gtk_marshal_NONE__POINTER_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__POINTER_INT_POINTER rfunc;
- rfunc = (GtkSignal_NONE__POINTER_INT_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER) (GtkObject * object,
- gint arg1,
- gpointer arg2,
- gint arg3,
- gint arg4,
- gint arg5,
- gpointer arg6,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER rfunc;
- rfunc = (GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_INT (args[2]),
- GTK_VALUE_INT (args[3]),
- GTK_VALUE_INT (args[4]),
- GTK_VALUE_POINTER (args[5]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_POINTER_INT_INT_INT) (GtkObject * object,
- gint arg1,
- gpointer arg2,
- gint arg3,
- gint arg4,
- gint arg5,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_POINTER_INT_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_POINTER_INT_INT_INT rfunc;
- rfunc = (GtkSignal_NONE__INT_POINTER_INT_INT_INT) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_INT (args[2]),
- GTK_VALUE_INT (args[3]),
- GTK_VALUE_INT (args[4]),
- func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_POINTER) (GtkObject * object,
- gint arg1,
- gpointer arg2,
- gpointer user_data);
-void
-gtk_marshal_NONE__INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkSignal_NONE__INT_POINTER rfunc;
- rfunc = (GtkSignal_NONE__INT_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_INT (args[0]),
- GTK_VALUE_POINTER (args[1]),
- func_data);
-}
+++ /dev/null
-#ifndef __GTKMARSHAL_H__
-#define __GTKMARSHAL_H__ 1
-
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#pragma }
-#endif /* __cplusplus */
-
-#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
-
- void gtk_marshal_BOOL__NONE (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_BOOL__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER
-
- void gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_ENUM__ENUM gtk_marshal_INT__INT
-
- void gtk_marshal_INT__INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_INT__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
-
- void gtk_marshal_NONE__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__C_CALLBACK (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__C_CALLBACK_C_CALLBACK (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__ENUM gtk_marshal_NONE__INT
-
- void gtk_marshal_NONE__INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__ENUM_FLOAT gtk_marshal_NONE__INT_FLOAT
-
- void gtk_marshal_NONE__INT_FLOAT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__ENUM_FLOAT_BOOL gtk_marshal_NONE__INT_FLOAT_BOOL
-
- void gtk_marshal_NONE__INT_FLOAT_BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__INT_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__NONE (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__OBJECT gtk_marshal_NONE__POINTER
-
- void gtk_marshal_NONE__POINTER_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
- void gtk_marshal_NONE__POINTER_POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-
-#define gtk_marshal_NONE__POINTER_UINT gtk_marshal_NONE__POINTER_INT
-
-#define gtk_marshal_NONE__POINTER_UINT_ENUM gtk_marshal_NONE__POINTER_INT_INT
-
- void gtk_marshal_NONE__POINTER_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT
-
-#define gtk_marshal_NONE__STRING gtk_marshal_NONE__POINTER
-
-#define gtk_marshal_NONE__STRING_INT_POINTER gtk_marshal_NONE__POINTER_INT_POINTER
-
- void gtk_marshal_NONE__POINTER_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__UINT gtk_marshal_NONE__INT
-
-#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER
-
- void gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM gtk_marshal_NONE__INT_POINTER_INT_INT_INT
-
- void gtk_marshal_NONE__INT_POINTER_INT_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-#define gtk_marshal_NONE__UINT_STRING gtk_marshal_NONE__INT_POINTER
-
- void gtk_marshal_NONE__INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GTKMARSHAL_H__ */
+++ /dev/null
-/* type macros, generated by maketypes.awk */
-
-extern GtkType GTK_TYPE_CELL_TYPE;
-extern GtkType GTK_TYPE_C_TREE_POS;
-extern GtkType GTK_TYPE_C_TREE_LINE_STYLE;
-extern GtkType GTK_TYPE_C_TREE_EXPANSION_TYPE;
-extern GtkType GTK_TYPE_DEBUG_FLAG;
-extern GtkType GTK_TYPE_ACCEL_FLAGS;
-extern GtkType GTK_TYPE_ARROW_TYPE;
-extern GtkType GTK_TYPE_ATTACH_OPTIONS;
-extern GtkType GTK_TYPE_BUTTON_BOX_STYLE;
-extern GtkType GTK_TYPE_CURVE_TYPE;
-extern GtkType GTK_TYPE_DIRECTION_TYPE;
-extern GtkType GTK_TYPE_JUSTIFICATION;
-extern GtkType GTK_TYPE_MATCH_TYPE;
-extern GtkType GTK_TYPE_MENU_DIRECTION_TYPE;
-extern GtkType GTK_TYPE_MENU_FACTORY_TYPE;
-extern GtkType GTK_TYPE_METRIC_TYPE;
-extern GtkType GTK_TYPE_ORIENTATION;
-extern GtkType GTK_TYPE_PACK_TYPE;
-extern GtkType GTK_TYPE_PATH_PRIORITY_TYPE;
-extern GtkType GTK_TYPE_PATH_TYPE;
-extern GtkType GTK_TYPE_POLICY_TYPE;
-extern GtkType GTK_TYPE_POSITION_TYPE;
-extern GtkType GTK_TYPE_PREVIEW_TYPE;
-extern GtkType GTK_TYPE_RELIEF_STYLE;
-extern GtkType GTK_TYPE_RESIZE_MODE;
-extern GtkType GTK_TYPE_SIGNAL_RUN_TYPE;
-extern GtkType GTK_TYPE_SCROLL_TYPE;
-extern GtkType GTK_TYPE_SELECTION_MODE;
-extern GtkType GTK_TYPE_SHADOW_TYPE;
-extern GtkType GTK_TYPE_STATE_TYPE;
-extern GtkType GTK_TYPE_SUBMENU_DIRECTION;
-extern GtkType GTK_TYPE_SUBMENU_PLACEMENT;
-extern GtkType GTK_TYPE_TOOLBAR_STYLE;
-extern GtkType GTK_TYPE_TROUGH_TYPE;
-extern GtkType GTK_TYPE_UPDATE_TYPE;
-extern GtkType GTK_TYPE_VISIBILITY;
-extern GtkType GTK_TYPE_WINDOW_POSITION;
-extern GtkType GTK_TYPE_WINDOW_TYPE;
-extern GtkType GTK_TYPE_SORT_TYPE;
-extern GtkType GTK_TYPE_FONT_METRIC_TYPE;
-extern GtkType GTK_TYPE_OBJECT_FLAGS;
-extern GtkType GTK_TYPE_ARG_FLAGS;
-extern GtkType GTK_TYPE_PACKER_OPTIONS;
-extern GtkType GTK_TYPE_SIDE_TYPE;
-extern GtkType GTK_TYPE_ANCHOR_TYPE;
-extern GtkType GTK_TYPE_PRIVATE_FLAGS;
-extern GtkType GTK_TYPE_PROGRESS_BAR_STYLE;
-extern GtkType GTK_TYPE_PROGRESS_BAR_ORIENTATION;
-extern GtkType GTK_TYPE_RC_TOKEN_TYPE;
-extern GtkType GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY;
-extern GtkType GTK_TYPE_SPIN_TYPE;
-extern GtkType GTK_TYPE_TOOLBAR_CHILD_TYPE;
-extern GtkType GTK_TYPE_TREE_VIEW_MODE;
-extern GtkType GTK_TYPE_FUNDAMENTAL_TYPE;
-extern GtkType GTK_TYPE_WIDGET_FLAGS;
-extern GtkType GTK_TYPE_GDK_COLOR_INFO_FLAGS;
-extern GtkType GTK_TYPE_GDK_DEBUG_FLAG;
-extern GtkType GTK_TYPE_GDK_RGB_DITHER;
-extern GtkType GTK_TYPE_GDK_WINDOW_TYPE;
-extern GtkType GTK_TYPE_GDK_WINDOW_CLASS;
-extern GtkType GTK_TYPE_GDK_IMAGE_TYPE;
-extern GtkType GTK_TYPE_GDK_VISUAL_TYPE;
-extern GtkType GTK_TYPE_GDK_FONT_TYPE;
-extern GtkType GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE;
-extern GtkType GTK_TYPE_GDK_WINDOW_HINTS;
-extern GtkType GTK_TYPE_GDK_FUNCTION;
-extern GtkType GTK_TYPE_GDK_FILL;
-extern GtkType GTK_TYPE_GDK_FILL_RULE;
-extern GtkType GTK_TYPE_GDK_LINE_STYLE;
-extern GtkType GTK_TYPE_GDK_CAP_STYLE;
-extern GtkType GTK_TYPE_GDK_JOIN_STYLE;
-extern GtkType GTK_TYPE_GDK_CURSOR_TYPE;
-extern GtkType GTK_TYPE_GDK_FILTER_RETURN;
-extern GtkType GTK_TYPE_GDK_VISIBILITY_STATE;
-extern GtkType GTK_TYPE_GDK_EVENT_TYPE;
-extern GtkType GTK_TYPE_GDK_EVENT_MASK;
-extern GtkType GTK_TYPE_GDK_NOTIFY_TYPE;
-extern GtkType GTK_TYPE_GDK_CROSSING_MODE;
-extern GtkType GTK_TYPE_GDK_MODIFIER_TYPE;
-extern GtkType GTK_TYPE_GDK_SUBWINDOW_MODE;
-extern GtkType GTK_TYPE_GDK_INPUT_CONDITION;
-extern GtkType GTK_TYPE_GDK_STATUS;
-extern GtkType GTK_TYPE_GDK_BYTE_ORDER;
-extern GtkType GTK_TYPE_GDK_GC_VALUES_MASK;
-extern GtkType GTK_TYPE_GDK_SELECTION;
-extern GtkType GTK_TYPE_GDK_PROPERTY_STATE;
-extern GtkType GTK_TYPE_GDK_PROP_MODE;
-extern GtkType GTK_TYPE_GDK_DND_TYPE;
-extern GtkType GTK_TYPE_GDK_INPUT_SOURCE;
-extern GtkType GTK_TYPE_GDK_INPUT_MODE;
-extern GtkType GTK_TYPE_GDK_AXIS_USE;
-extern GtkType GTK_TYPE_GDK_TARGET;
-extern GtkType GTK_TYPE_GDK_SELECTION_TYPE;
-extern GtkType GTK_TYPE_GDK_EXTENSION_MODE;
-extern GtkType GTK_TYPE_GDK_IM_STYLE;
-extern GtkType GTK_TYPE_GDK_WM_DECORATION;
-extern GtkType GTK_TYPE_GDK_WM_FUNCTION;
-extern GtkType GTK_TYPE_GDK_COLOR_CONTEXT_MODE;
-extern GtkType GTK_TYPE_GDK_OVERLAP_TYPE;
-extern GtkType GTK_TYPE_ACCEL_GROUP;
-extern GtkType GTK_TYPE_SELECTION_DATA;
-extern GtkType GTK_TYPE_STYLE;
-extern GtkType GTK_TYPE_GDK_COLORMAP;
-extern GtkType GTK_TYPE_GDK_VISUAL;
-extern GtkType GTK_TYPE_GDK_FONT;
-extern GtkType GTK_TYPE_GDK_WINDOW;
-extern GtkType GTK_TYPE_GDK_EVENT;
-extern GtkType GTK_TYPE_GDK_COLOR;
-
-#define GTK_TYPE_NUM_BUILTINS (108)
+++ /dev/null
-/* type entries, generated by maketypes.awk */
-
- { "GtkCellType", >K_TYPE_CELL_TYPE,
- GTK_TYPE_ENUM, _gtk_cell_type_values },
- { "GtkCTreePos", >K_TYPE_C_TREE_POS,
- GTK_TYPE_ENUM, _gtk_c_tree_pos_values },
- { "GtkCTreeLineStyle", >K_TYPE_C_TREE_LINE_STYLE,
- GTK_TYPE_ENUM, _gtk_c_tree_line_style_values },
- { "GtkCTreeExpansionType", >K_TYPE_C_TREE_EXPANSION_TYPE,
- GTK_TYPE_ENUM, _gtk_c_tree_expansion_type_values },
- { "GtkDebugFlag", >K_TYPE_DEBUG_FLAG,
- GTK_TYPE_FLAGS, _gtk_debug_flag_values },
- { "GtkAccelFlags", >K_TYPE_ACCEL_FLAGS,
- GTK_TYPE_FLAGS, _gtk_accel_flags_values },
- { "GtkArrowType", >K_TYPE_ARROW_TYPE,
- GTK_TYPE_ENUM, _gtk_arrow_type_values },
- { "GtkAttachOptions", >K_TYPE_ATTACH_OPTIONS,
- GTK_TYPE_FLAGS, _gtk_attach_options_values },
- { "GtkButtonBoxStyle", >K_TYPE_BUTTON_BOX_STYLE,
- GTK_TYPE_ENUM, _gtk_button_box_style_values },
- { "GtkCurveType", >K_TYPE_CURVE_TYPE,
- GTK_TYPE_ENUM, _gtk_curve_type_values },
- { "GtkDirectionType", >K_TYPE_DIRECTION_TYPE,
- GTK_TYPE_ENUM, _gtk_direction_type_values },
- { "GtkJustification", >K_TYPE_JUSTIFICATION,
- GTK_TYPE_ENUM, _gtk_justification_values },
- { "GtkMatchType", >K_TYPE_MATCH_TYPE,
- GTK_TYPE_ENUM, _gtk_match_type_values },
- { "GtkMenuDirectionType", >K_TYPE_MENU_DIRECTION_TYPE,
- GTK_TYPE_ENUM, _gtk_menu_direction_type_values },
- { "GtkMenuFactoryType", >K_TYPE_MENU_FACTORY_TYPE,
- GTK_TYPE_ENUM, _gtk_menu_factory_type_values },
- { "GtkMetricType", >K_TYPE_METRIC_TYPE,
- GTK_TYPE_ENUM, _gtk_metric_type_values },
- { "GtkOrientation", >K_TYPE_ORIENTATION,
- GTK_TYPE_ENUM, _gtk_orientation_values },
- { "GtkPackType", >K_TYPE_PACK_TYPE,
- GTK_TYPE_ENUM, _gtk_pack_type_values },
- { "GtkPathPriorityType", >K_TYPE_PATH_PRIORITY_TYPE,
- GTK_TYPE_ENUM, _gtk_path_priority_type_values },
- { "GtkPathType", >K_TYPE_PATH_TYPE,
- GTK_TYPE_ENUM, _gtk_path_type_values },
- { "GtkPolicyType", >K_TYPE_POLICY_TYPE,
- GTK_TYPE_ENUM, _gtk_policy_type_values },
- { "GtkPositionType", >K_TYPE_POSITION_TYPE,
- GTK_TYPE_ENUM, _gtk_position_type_values },
- { "GtkPreviewType", >K_TYPE_PREVIEW_TYPE,
- GTK_TYPE_ENUM, _gtk_preview_type_values },
- { "GtkReliefStyle", >K_TYPE_RELIEF_STYLE,
- GTK_TYPE_ENUM, _gtk_relief_style_values },
- { "GtkResizeMode", >K_TYPE_RESIZE_MODE,
- GTK_TYPE_ENUM, _gtk_resize_mode_values },
- { "GtkSignalRunType", >K_TYPE_SIGNAL_RUN_TYPE,
- GTK_TYPE_FLAGS, _gtk_signal_run_type_values },
- { "GtkScrollType", >K_TYPE_SCROLL_TYPE,
- GTK_TYPE_ENUM, _gtk_scroll_type_values },
- { "GtkSelectionMode", >K_TYPE_SELECTION_MODE,
- GTK_TYPE_ENUM, _gtk_selection_mode_values },
- { "GtkShadowType", >K_TYPE_SHADOW_TYPE,
- GTK_TYPE_ENUM, _gtk_shadow_type_values },
- { "GtkStateType", >K_TYPE_STATE_TYPE,
- GTK_TYPE_ENUM, _gtk_state_type_values },
- { "GtkSubmenuDirection", >K_TYPE_SUBMENU_DIRECTION,
- GTK_TYPE_ENUM, _gtk_submenu_direction_values },
- { "GtkSubmenuPlacement", >K_TYPE_SUBMENU_PLACEMENT,
- GTK_TYPE_ENUM, _gtk_submenu_placement_values },
- { "GtkToolbarStyle", >K_TYPE_TOOLBAR_STYLE,
- GTK_TYPE_ENUM, _gtk_toolbar_style_values },
- { "GtkTroughType", >K_TYPE_TROUGH_TYPE,
- GTK_TYPE_ENUM, _gtk_trough_type_values },
- { "GtkUpdateType", >K_TYPE_UPDATE_TYPE,
- GTK_TYPE_ENUM, _gtk_update_type_values },
- { "GtkVisibility", >K_TYPE_VISIBILITY,
- GTK_TYPE_ENUM, _gtk_visibility_values },
- { "GtkWindowPosition", >K_TYPE_WINDOW_POSITION,
- GTK_TYPE_ENUM, _gtk_window_position_values },
- { "GtkWindowType", >K_TYPE_WINDOW_TYPE,
- GTK_TYPE_ENUM, _gtk_window_type_values },
- { "GtkSortType", >K_TYPE_SORT_TYPE,
- GTK_TYPE_ENUM, _gtk_sort_type_values },
- { "GtkFontMetricType", >K_TYPE_FONT_METRIC_TYPE,
- GTK_TYPE_ENUM, _gtk_font_metric_type_values },
- { "GtkObjectFlags", >K_TYPE_OBJECT_FLAGS,
- GTK_TYPE_FLAGS, _gtk_object_flags_values },
- { "GtkArgFlags", >K_TYPE_ARG_FLAGS,
- GTK_TYPE_FLAGS, _gtk_arg_flags_values },
- { "GtkPackerOptions", >K_TYPE_PACKER_OPTIONS,
- GTK_TYPE_FLAGS, _gtk_packer_options_values },
- { "GtkSideType", >K_TYPE_SIDE_TYPE,
- GTK_TYPE_ENUM, _gtk_side_type_values },
- { "GtkAnchorType", >K_TYPE_ANCHOR_TYPE,
- GTK_TYPE_ENUM, _gtk_anchor_type_values },
- { "GtkPrivateFlags", >K_TYPE_PRIVATE_FLAGS,
- GTK_TYPE_FLAGS, _gtk_private_flags_values },
- { "GtkProgressBarStyle", >K_TYPE_PROGRESS_BAR_STYLE,
- GTK_TYPE_ENUM, _gtk_progress_bar_style_values },
- { "GtkProgressBarOrientation", >K_TYPE_PROGRESS_BAR_ORIENTATION,
- GTK_TYPE_ENUM, _gtk_progress_bar_orientation_values },
- { "GtkRcTokenType", >K_TYPE_RC_TOKEN_TYPE,
- GTK_TYPE_ENUM, _gtk_rc_token_type_values },
- { "GtkSpinButtonUpdatePolicy", >K_TYPE_SPIN_BUTTON_UPDATE_POLICY,
- GTK_TYPE_ENUM, _gtk_spin_button_update_policy_values },
- { "GtkSpinType", >K_TYPE_SPIN_TYPE,
- GTK_TYPE_ENUM, _gtk_spin_type_values },
- { "GtkToolbarChildType", >K_TYPE_TOOLBAR_CHILD_TYPE,
- GTK_TYPE_ENUM, _gtk_toolbar_child_type_values },
- { "GtkTreeViewMode", >K_TYPE_TREE_VIEW_MODE,
- GTK_TYPE_ENUM, _gtk_tree_view_mode_values },
- { "GtkFundamentalType", >K_TYPE_FUNDAMENTAL_TYPE,
- GTK_TYPE_ENUM, _gtk_fundamental_type_values },
- { "GtkWidgetFlags", >K_TYPE_WIDGET_FLAGS,
- GTK_TYPE_FLAGS, _gtk_widget_flags_values },
- { "GdkColorInfoFlags", >K_TYPE_GDK_COLOR_INFO_FLAGS,
- GTK_TYPE_FLAGS, _gdk_color_info_flags_values },
- { "GdkDebugFlag", >K_TYPE_GDK_DEBUG_FLAG,
- GTK_TYPE_FLAGS, _gdk_debug_flag_values },
- { "GdkRgbDither", >K_TYPE_GDK_RGB_DITHER,
- GTK_TYPE_ENUM, _gdk_rgb_dither_values },
- { "GdkWindowType", >K_TYPE_GDK_WINDOW_TYPE,
- GTK_TYPE_ENUM, _gdk_window_type_values },
- { "GdkWindowClass", >K_TYPE_GDK_WINDOW_CLASS,
- GTK_TYPE_ENUM, _gdk_window_class_values },
- { "GdkImageType", >K_TYPE_GDK_IMAGE_TYPE,
- GTK_TYPE_ENUM, _gdk_image_type_values },
- { "GdkVisualType", >K_TYPE_GDK_VISUAL_TYPE,
- GTK_TYPE_ENUM, _gdk_visual_type_values },
- { "GdkFontType", >K_TYPE_GDK_FONT_TYPE,
- GTK_TYPE_ENUM, _gdk_font_type_values },
- { "GdkWindowAttributesType", >K_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE,
- GTK_TYPE_FLAGS, _gdk_window_attributes_type_values },
- { "GdkWindowHints", >K_TYPE_GDK_WINDOW_HINTS,
- GTK_TYPE_FLAGS, _gdk_window_hints_values },
- { "GdkFunction", >K_TYPE_GDK_FUNCTION,
- GTK_TYPE_ENUM, _gdk_function_values },
- { "GdkFill", >K_TYPE_GDK_FILL,
- GTK_TYPE_ENUM, _gdk_fill_values },
- { "GdkFillRule", >K_TYPE_GDK_FILL_RULE,
- GTK_TYPE_ENUM, _gdk_fill_rule_values },
- { "GdkLineStyle", >K_TYPE_GDK_LINE_STYLE,
- GTK_TYPE_ENUM, _gdk_line_style_values },
- { "GdkCapStyle", >K_TYPE_GDK_CAP_STYLE,
- GTK_TYPE_ENUM, _gdk_cap_style_values },
- { "GdkJoinStyle", >K_TYPE_GDK_JOIN_STYLE,
- GTK_TYPE_ENUM, _gdk_join_style_values },
- { "GdkCursorType", >K_TYPE_GDK_CURSOR_TYPE,
- GTK_TYPE_ENUM, _gdk_cursor_type_values },
- { "GdkFilterReturn", >K_TYPE_GDK_FILTER_RETURN,
- GTK_TYPE_ENUM, _gdk_filter_return_values },
- { "GdkVisibilityState", >K_TYPE_GDK_VISIBILITY_STATE,
- GTK_TYPE_ENUM, _gdk_visibility_state_values },
- { "GdkEventType", >K_TYPE_GDK_EVENT_TYPE,
- GTK_TYPE_ENUM, _gdk_event_type_values },
- { "GdkEventMask", >K_TYPE_GDK_EVENT_MASK,
- GTK_TYPE_FLAGS, _gdk_event_mask_values },
- { "GdkNotifyType", >K_TYPE_GDK_NOTIFY_TYPE,
- GTK_TYPE_ENUM, _gdk_notify_type_values },
- { "GdkCrossingMode", >K_TYPE_GDK_CROSSING_MODE,
- GTK_TYPE_ENUM, _gdk_crossing_mode_values },
- { "GdkModifierType", >K_TYPE_GDK_MODIFIER_TYPE,
- GTK_TYPE_FLAGS, _gdk_modifier_type_values },
- { "GdkSubwindowMode", >K_TYPE_GDK_SUBWINDOW_MODE,
- GTK_TYPE_ENUM, _gdk_subwindow_mode_values },
- { "GdkInputCondition", >K_TYPE_GDK_INPUT_CONDITION,
- GTK_TYPE_FLAGS, _gdk_input_condition_values },
- { "GdkStatus", >K_TYPE_GDK_STATUS,
- GTK_TYPE_ENUM, _gdk_status_values },
- { "GdkByteOrder", >K_TYPE_GDK_BYTE_ORDER,
- GTK_TYPE_ENUM, _gdk_byte_order_values },
- { "GdkGCValuesMask", >K_TYPE_GDK_GC_VALUES_MASK,
- GTK_TYPE_FLAGS, _gdk_gc_values_mask_values },
- { "GdkSelection", >K_TYPE_GDK_SELECTION,
- GTK_TYPE_ENUM, _gdk_selection_values },
- { "GdkPropertyState", >K_TYPE_GDK_PROPERTY_STATE,
- GTK_TYPE_ENUM, _gdk_property_state_values },
- { "GdkPropMode", >K_TYPE_GDK_PROP_MODE,
- GTK_TYPE_ENUM, _gdk_prop_mode_values },
- { "GdkDndType", >K_TYPE_GDK_DND_TYPE,
- GTK_TYPE_ENUM, _gdk_dnd_type_values },
- { "GdkInputSource", >K_TYPE_GDK_INPUT_SOURCE,
- GTK_TYPE_ENUM, _gdk_input_source_values },
- { "GdkInputMode", >K_TYPE_GDK_INPUT_MODE,
- GTK_TYPE_ENUM, _gdk_input_mode_values },
- { "GdkAxisUse", >K_TYPE_GDK_AXIS_USE,
- GTK_TYPE_ENUM, _gdk_axis_use_values },
- { "GdkTarget", >K_TYPE_GDK_TARGET,
- GTK_TYPE_ENUM, _gdk_target_values },
- { "GdkSelectionType", >K_TYPE_GDK_SELECTION_TYPE,
- GTK_TYPE_ENUM, _gdk_selection_type_values },
- { "GdkExtensionMode", >K_TYPE_GDK_EXTENSION_MODE,
- GTK_TYPE_ENUM, _gdk_extension_mode_values },
- { "GdkIMStyle", >K_TYPE_GDK_IM_STYLE,
- GTK_TYPE_FLAGS, _gdk_im_style_values },
- { "GdkWMDecoration", >K_TYPE_GDK_WM_DECORATION,
- GTK_TYPE_FLAGS, _gdk_wm_decoration_values },
- { "GdkWMFunction", >K_TYPE_GDK_WM_FUNCTION,
- GTK_TYPE_FLAGS, _gdk_wm_function_values },
- { "GdkColorContextMode", >K_TYPE_GDK_COLOR_CONTEXT_MODE,
- GTK_TYPE_ENUM, _gdk_color_context_mode_values },
- { "GdkOverlapType", >K_TYPE_GDK_OVERLAP_TYPE,
- GTK_TYPE_ENUM, _gdk_overlap_type_values },
- { "GtkAccelGroup", >K_TYPE_ACCEL_GROUP,
- GTK_TYPE_BOXED, NULL },
- { "GtkSelectionData", >K_TYPE_SELECTION_DATA,
- GTK_TYPE_BOXED, NULL },
- { "GtkStyle", >K_TYPE_STYLE,
- GTK_TYPE_BOXED, NULL },
- { "GdkColormap", >K_TYPE_GDK_COLORMAP,
- GTK_TYPE_BOXED, NULL },
- { "GdkVisual", >K_TYPE_GDK_VISUAL,
- GTK_TYPE_BOXED, NULL },
- { "GdkFont", >K_TYPE_GDK_FONT,
- GTK_TYPE_BOXED, NULL },
- { "GdkWindow", >K_TYPE_GDK_WINDOW,
- GTK_TYPE_BOXED, NULL },
- { "GdkEvent", >K_TYPE_GDK_EVENT,
- GTK_TYPE_BOXED, NULL },
- { "GdkColor", >K_TYPE_GDK_COLOR,
- GTK_TYPE_BOXED, NULL },
+++ /dev/null
-/* type variables, generated by maketypes.awk */
-
-GtkType GTK_TYPE_CELL_TYPE = 0;
-GtkType GTK_TYPE_C_TREE_POS = 0;
-GtkType GTK_TYPE_C_TREE_LINE_STYLE = 0;
-GtkType GTK_TYPE_C_TREE_EXPANSION_TYPE = 0;
-GtkType GTK_TYPE_DEBUG_FLAG = 0;
-GtkType GTK_TYPE_ACCEL_FLAGS = 0;
-GtkType GTK_TYPE_ARROW_TYPE = 0;
-GtkType GTK_TYPE_ATTACH_OPTIONS = 0;
-GtkType GTK_TYPE_BUTTON_BOX_STYLE = 0;
-GtkType GTK_TYPE_CURVE_TYPE = 0;
-GtkType GTK_TYPE_DIRECTION_TYPE = 0;
-GtkType GTK_TYPE_JUSTIFICATION = 0;
-GtkType GTK_TYPE_MATCH_TYPE = 0;
-GtkType GTK_TYPE_MENU_DIRECTION_TYPE = 0;
-GtkType GTK_TYPE_MENU_FACTORY_TYPE = 0;
-GtkType GTK_TYPE_METRIC_TYPE = 0;
-GtkType GTK_TYPE_ORIENTATION = 0;
-GtkType GTK_TYPE_PACK_TYPE = 0;
-GtkType GTK_TYPE_PATH_PRIORITY_TYPE = 0;
-GtkType GTK_TYPE_PATH_TYPE = 0;
-GtkType GTK_TYPE_POLICY_TYPE = 0;
-GtkType GTK_TYPE_POSITION_TYPE = 0;
-GtkType GTK_TYPE_PREVIEW_TYPE = 0;
-GtkType GTK_TYPE_RELIEF_STYLE = 0;
-GtkType GTK_TYPE_RESIZE_MODE = 0;
-GtkType GTK_TYPE_SIGNAL_RUN_TYPE = 0;
-GtkType GTK_TYPE_SCROLL_TYPE = 0;
-GtkType GTK_TYPE_SELECTION_MODE = 0;
-GtkType GTK_TYPE_SHADOW_TYPE = 0;
-GtkType GTK_TYPE_STATE_TYPE = 0;
-GtkType GTK_TYPE_SUBMENU_DIRECTION = 0;
-GtkType GTK_TYPE_SUBMENU_PLACEMENT = 0;
-GtkType GTK_TYPE_TOOLBAR_STYLE = 0;
-GtkType GTK_TYPE_TROUGH_TYPE = 0;
-GtkType GTK_TYPE_UPDATE_TYPE = 0;
-GtkType GTK_TYPE_VISIBILITY = 0;
-GtkType GTK_TYPE_WINDOW_POSITION = 0;
-GtkType GTK_TYPE_WINDOW_TYPE = 0;
-GtkType GTK_TYPE_SORT_TYPE = 0;
-GtkType GTK_TYPE_FONT_METRIC_TYPE = 0;
-GtkType GTK_TYPE_OBJECT_FLAGS = 0;
-GtkType GTK_TYPE_ARG_FLAGS = 0;
-GtkType GTK_TYPE_PACKER_OPTIONS = 0;
-GtkType GTK_TYPE_SIDE_TYPE = 0;
-GtkType GTK_TYPE_ANCHOR_TYPE = 0;
-GtkType GTK_TYPE_PRIVATE_FLAGS = 0;
-GtkType GTK_TYPE_PROGRESS_BAR_STYLE = 0;
-GtkType GTK_TYPE_PROGRESS_BAR_ORIENTATION = 0;
-GtkType GTK_TYPE_RC_TOKEN_TYPE = 0;
-GtkType GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY = 0;
-GtkType GTK_TYPE_SPIN_TYPE = 0;
-GtkType GTK_TYPE_TOOLBAR_CHILD_TYPE = 0;
-GtkType GTK_TYPE_TREE_VIEW_MODE = 0;
-GtkType GTK_TYPE_FUNDAMENTAL_TYPE = 0;
-GtkType GTK_TYPE_WIDGET_FLAGS = 0;
-GtkType GTK_TYPE_GDK_COLOR_INFO_FLAGS = 0;
-GtkType GTK_TYPE_GDK_DEBUG_FLAG = 0;
-GtkType GTK_TYPE_GDK_RGB_DITHER = 0;
-GtkType GTK_TYPE_GDK_WINDOW_TYPE = 0;
-GtkType GTK_TYPE_GDK_WINDOW_CLASS = 0;
-GtkType GTK_TYPE_GDK_IMAGE_TYPE = 0;
-GtkType GTK_TYPE_GDK_VISUAL_TYPE = 0;
-GtkType GTK_TYPE_GDK_FONT_TYPE = 0;
-GtkType GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE = 0;
-GtkType GTK_TYPE_GDK_WINDOW_HINTS = 0;
-GtkType GTK_TYPE_GDK_FUNCTION = 0;
-GtkType GTK_TYPE_GDK_FILL = 0;
-GtkType GTK_TYPE_GDK_FILL_RULE = 0;
-GtkType GTK_TYPE_GDK_LINE_STYLE = 0;
-GtkType GTK_TYPE_GDK_CAP_STYLE = 0;
-GtkType GTK_TYPE_GDK_JOIN_STYLE = 0;
-GtkType GTK_TYPE_GDK_CURSOR_TYPE = 0;
-GtkType GTK_TYPE_GDK_FILTER_RETURN = 0;
-GtkType GTK_TYPE_GDK_VISIBILITY_STATE = 0;
-GtkType GTK_TYPE_GDK_EVENT_TYPE = 0;
-GtkType GTK_TYPE_GDK_EVENT_MASK = 0;
-GtkType GTK_TYPE_GDK_NOTIFY_TYPE = 0;
-GtkType GTK_TYPE_GDK_CROSSING_MODE = 0;
-GtkType GTK_TYPE_GDK_MODIFIER_TYPE = 0;
-GtkType GTK_TYPE_GDK_SUBWINDOW_MODE = 0;
-GtkType GTK_TYPE_GDK_INPUT_CONDITION = 0;
-GtkType GTK_TYPE_GDK_STATUS = 0;
-GtkType GTK_TYPE_GDK_BYTE_ORDER = 0;
-GtkType GTK_TYPE_GDK_GC_VALUES_MASK = 0;
-GtkType GTK_TYPE_GDK_SELECTION = 0;
-GtkType GTK_TYPE_GDK_PROPERTY_STATE = 0;
-GtkType GTK_TYPE_GDK_PROP_MODE = 0;
-GtkType GTK_TYPE_GDK_DND_TYPE = 0;
-GtkType GTK_TYPE_GDK_INPUT_SOURCE = 0;
-GtkType GTK_TYPE_GDK_INPUT_MODE = 0;
-GtkType GTK_TYPE_GDK_AXIS_USE = 0;
-GtkType GTK_TYPE_GDK_TARGET = 0;
-GtkType GTK_TYPE_GDK_SELECTION_TYPE = 0;
-GtkType GTK_TYPE_GDK_EXTENSION_MODE = 0;
-GtkType GTK_TYPE_GDK_IM_STYLE = 0;
-GtkType GTK_TYPE_GDK_WM_DECORATION = 0;
-GtkType GTK_TYPE_GDK_WM_FUNCTION = 0;
-GtkType GTK_TYPE_GDK_COLOR_CONTEXT_MODE = 0;
-GtkType GTK_TYPE_GDK_OVERLAP_TYPE = 0;
-GtkType GTK_TYPE_ACCEL_GROUP = 0;
-GtkType GTK_TYPE_SELECTION_DATA = 0;
-GtkType GTK_TYPE_STYLE = 0;
-GtkType GTK_TYPE_GDK_COLORMAP = 0;
-GtkType GTK_TYPE_GDK_VISUAL = 0;
-GtkType GTK_TYPE_GDK_FONT = 0;
-GtkType GTK_TYPE_GDK_WINDOW = 0;
-GtkType GTK_TYPE_GDK_EVENT = 0;
-GtkType GTK_TYPE_GDK_COLOR = 0;
# A lot of this script is taken from autoconf-2.10.
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+echo=echo
+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.
+ exec "$SHELL" "$0" --no-reexec ${1+"$@"}
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-echo=echo
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
-else
+if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
# The Solaris, AIX, and Digital Unix default echo programs unquote
# backslashes. This makes it impossible to quote backslashes using
# echo "$something" | sed 's/\\/\\\\/g'
if test "X`(print -r '\t') 2>/dev/null`" = 'X\t'; then
# This shell has a builtin print -r that does the trick.
echo='print -r'
-#
-# The following is from libtool-1.2a, won't work with this patched
-# libtool-1.2
-#
-# elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
-# # If we have ksh, try running ltconfig again with it.
-# CONFIG_SHELL=/bin/ksh
-# export CONFIG_SHELL
-# exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
+ elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running ltconfig again with it.
+ 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'; then :
- else
+ if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
# Oops. We lost completely, so just stick with echo.
echo=echo
fi
# Constants:
PROGRAM=ltconfig
PACKAGE=libtool
-VERSION=1.2
+VERSION=1.2b
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
rm="rm -f"
help="Try \`$progname --help' for more information."
# Global variables:
+default_ofile=libtool
can_build_shared=yes
enable_shared=yes
# All known linkers require a `.a' archive for static linking.
ac_config_sub=
host=
nonopt=
+ofile="$default_ofile"
verify_host=yes
with_gcc=no
with_gnu_ld=no
Generate a system-specific libtool script.
+ --debug enable verbose shell tracing
--disable-shared do not build shared libraries
--disable-static do not build static libraries
--help display this help and exit
--no-verify do not verify that HOST is a valid host type
+-o, --output=FILE specify the output file [default=$default_ofile]
--quiet same as \`--silent'
--silent do not print informational messages
--srcdir=DIR find \`config.guess' in DIR
exit 0
;;
+ --debug)
+ echo "$progname: enabling shell trace mode"
+ set -x
+ ;;
+
--disable-shared) enable_shared=no ;;
--disable-static) enable_static=no ;;
--no-verify) verify_host=no ;;
+ --output | -o) prev=ofile ;;
+ --output=*) ofile="$optarg" ;;
+
--version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
--with-gcc) with_gcc=yes ;;
exit 1
fi
-if test -f "$ltmain"; then :
-else
+if test ! -f "$ltmain"; then
echo "$progname: \`$ltmain' does not exist" 1>&2
echo "$help" 1>&2
exit 1
ac_config_sub=$ac_aux_dir/config.sub
# Make sure we can run config.sub.
- if $ac_config_sub sun4 >/dev/null 2>&1; then :
+ if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
else
echo "$progname: cannot run $ac_config_sub" 1>&2
echo "$help" 1>&2
host_alias=$host
case "$host_alias" in
"")
- if host_alias=`$ac_config_guess`; then :
+ if host_alias=`$SHELL $ac_config_guess`; then :
else
echo "$progname: cannot guess host type; you must specify one" 1>&2
echo "$help" 1>&2
exit 1
fi ;;
esac
- host=`$ac_config_sub $host_alias`
+ host=`$SHELL $ac_config_sub $host_alias`
echo "$ac_t$host" 1>&6
# Make sure the host verified.
# Now see if the compiler is really GCC.
with_gcc=no
echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
- echo "$progname:444: checking whether we are using GNU C" >&5
+ echo "$progname:462: checking whether we are using GNU C" >&5
$rm conftest.c
cat > conftest.c <<EOF
yes;
#endif
EOF
- if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
with_gcc=yes
fi
$rm conftest.c
link_static_flag='-bnso -bI:/lib/syscalls.exp'
;;
- hpux9* | hpux10*)
+ hpux9* | hpux10* | hpux11*)
# Is there a better link_static_flag that works with the bundled CC?
wl='-Wl,'
link_static_flag="${wl}-a ${wl}archive"
link_static_flag='-Bstatic'
;;
- linux*aout)
- can_build_shared=no
- ;;
-
- linux*)
- case "$CC" in
- *lcc | *lcc\ *)
- wl=-Wl
- link_static_flag='-static'
- pic_flag=
- ;;
- *)
- can_build_shared=no
- esac
- ;;
-
*)
can_build_shared=no
;;
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pic_flag -DPIC"
- echo "$progname:567: checking if $compiler PIC flag $pic_flag works" >&5
- if { (eval echo $progname:568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
+ echo "$progname:585: checking if $compiler PIC flag $pic_flag works" >&5
+ if { (eval echo $progname:586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
# Append any warnings to the config.log.
cat conftest.err 1>&5
echo 'main(){return(0);}' > conftest.c
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:611: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+echo "$progname:629: checking if $compiler static flag $link_static_flag works" >&5
+if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
echo "$ac_t$link_static_flag" 1>&6
else
echo "$ac_t"none 1>&6
if test "$with_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
- echo "$progname:644: checking for ld used by GCC" >&5
+ echo "$progname:662: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
- /* | [A-Za-z]:\\*)
+ /* | [A-Za-z]:[/\\]*)
test -z "$LD" && LD="$ac_prog"
;;
"")
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld... $ac_c" 1>&6
- echo "$progname:662: checking for GNU ld" >&5
+ echo "$progname:680: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
- echo "$progname:665: checking for non-GNU ld" >&5
+ echo "$progname:683: checking for non-GNU ld" >&5
fi
if test -z "$LD"; then
archive_cmds=
old_archive_from_new_cmds=
export_dynamic_flag_spec=
+whole_archive_flag_spec=
hardcode_libdir_flag_spec=
hardcode_libdir_separator=
hardcode_direct=no
hardcode_shlibpath_var=unsupported
runpath_var=
-case "$host_os" in
-amigaos* | sunos4*)
- # On these operating systems, we should treat GNU ld like the system ld.
- gnu_ld_acts_native=yes
- ;;
-*)
- gnu_ld_acts_native=no
- ;;
-esac
-
ld_shlibs=yes
-if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
+if test "$with_gnu_ld" = yes; then
# See if GNU ld supports shared libraries.
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
- runpath_var=LD_RUN_PATH
- ld_shlibs=yes
- else
- ld_shlibs=no
- fi
+ case "$host_os" in
+ amigaos*)
+ archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ linux-gnu*)
+ archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs'
+ ;;
+
+ *)
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
if test "$ld_shlibs" = yes; then
+ runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec='${wl}--export-dynamic'
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
archive_cmds='$CC -shared -o $lib$libobjs'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
- hardcode_minus_L=yes
+ hardcode_minus_L=no
hardcode_shlibpath_var=no
;;
export_dynamic_flag_spec='${wl}-E'
;;
- hpux10*)
+ hpux10* | hpux11*)
archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs'
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_direct=yes
;;
irix5* | irix6*)
- archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
+ if test "$with_gcc" = yes; then
+ archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs'
+ else
+ archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
+ fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
;;
;;
sunos4*)
- if test "$with_gcc" = yes; then
- archive_cmds='$CC -shared -o $lib$libobjs'
- else
- archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
- fi
-
- if test "$with_gnu_ld" = yes; then
- export_dynamic_flag_spec='${wl}-export-dynamic'
- fi
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=yes
hardcode_minus_L=yes
if test -z "$NM"; then
echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
case "$NM" in
- /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path.
+ /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path.
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
main(){nm_test_var='a';nm_test_func();return(0);}
EOF
-echo "$progname:991: checking if global_symbol_pipe works" >&5
-if { (eval echo $progname:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
+echo "$progname:1017: checking if global_symbol_pipe works" >&5
+if { (eval echo $progname:1018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { echo "$progname:995: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+ if { echo "$progname:1021: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
save_CFLAGS="$CFLAGS"
LIBS='conftestm.o'
CFLAGS="$CFLAGS$no_builtin_flag"
- if { (eval echo $progname:1053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ if { (eval echo $progname:1079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
else
echo "$progname: failed program was:" >&5
# We can link without hardcoding, and we can hardcode nonexisting dirs.
hardcode_action=immediate
fi
-elif test "$hardcode_direct" != yes && \
- test "$hardcode_minus_L" != yes && \
- test "$hardcode_shlibpath_var" != yes; then
- # We cannot hardcode anything.
- hardcode_action=unsupported
else
- # We can only hardcode existing directories.
- hardcode_action=relink
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
fi
echo "$ac_t$hardcode_action" 1>&6
-test "$hardcode_action" = unsupported && can_build_shared=no
reload_flag=
reload_cmds='$LD$reload_flag -o $output$reload_objs'
echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-# PORTME Some linker may need a different reload flag.
+# PORTME Some linkers may need a different reload flag.
reload_flag='-r'
-echo "$ac_t$reload_flag"
+echo "$ac_t$reload_flag" 1>&6
test -n "$reload_flag" && reload_flag=" $reload_flag"
# PORTME Fill in your ld.so characteristics
case "$host_os" in
aix3* | aix4*)
version_type=linux
- library_names_spec='${libname}${release}.so.$versuffix $libname.a'
+ library_names_spec='${libname}${release}.so$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}.so.$major'
+ soname_spec='${libname}${release}.so$major'
;;
amigaos*)
freebsd2* | freebsd3*)
version_type=sunos
- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
;;
gnu*)
- version_type=sunos
- library_names_spec='${libname}${release}.so.$versuffix'
+ version_type=linux
+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
shlibpath_var=LD_LIBRARY_PATH
;;
-hpux9* | hpux10*)
+hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
dynamic_linker="$host_os dld.sl"
version_type=sunos
shlibpath_var=SHLIB_PATH
- library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl'
- soname_spec='${libname}${release}.sl.$major'
+ library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+ soname_spec='${libname}${release}.sl$major'
# HP-UX runs *really* slowly unless shared libraries are mode 555.
postinstall_cmds='chmod 555 $lib'
;;
irix5* | irix6*)
version_type=osf
soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
shlibpath_var=LD_LIBRARY_PATH
;;
# This must be Linux ELF.
linux-gnu*)
version_type=linux
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
- soname_spec='${libname}${release}.so.$major'
- finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -f /lib/ld.so.1; then
netbsd* | openbsd*)
version_type=sunos
- library_names_spec='${libname}${release}.so.$versuffix'
- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+ library_names_spec='${libname}${release}.so$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
;;
osf3* | osf4*)
version_type=osf
soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
shlibpath_var=LD_LIBRARY_PATH
;;
sco3.2v5*)
version_type=osf
- soname_spec='${libname}${release}.so.$major'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH
;;
solaris2*)
version_type=linux
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
- soname_spec='${libname}${release}.so.$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
;;
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}.so.$versuffix'
- finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir'
+ library_names_spec='${libname}${release}.so$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
;;
sysv4.2uw2*)
version_type=linux
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
- soname_spec='${libname}${release}.so.$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
;;
uts4*)
version_type=linux
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
- soname_spec='${libname}${release}.so.$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
;;
for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \
link_static_flag no_builtin_flag export_dynamic_flag_spec \
- libname_spec library_names_spec soname_spec RANLIB \
+ whole_archive_flag_spec libname_spec library_names_spec soname_spec RANLIB \
old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \
allow_undefined_flag no_undefined_flag \
esac
done
-ofile=libtool
-trap "$rm $ofile; exit 1" 1 2 15
-echo creating $ofile
-$rm $ofile
-cat <<EOF > $ofile
-#! /bin/sh
+trap "$rm \"$ofile\"; exit 1" 1 2 15
+echo "creating $ofile"
+$rm "$ofile"
+cat <<EOF > "$ofile"
+#! $SHELL
-# libtool - Provide generalized library-building support services.
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
# Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
#
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This program was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
-# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
-# $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="sed -e s/^X//"
# if CDPATH is set.
if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-# An echo program that does not interpret backslashes.
-echo="$ltecho"
+### BEGIN LIBTOOL CONFIG
+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
+# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
+# $0$ltconfig_args
+#
+# Compiler and other test output produced by $progname, useful for
+# debugging $progname, is in ./config.log if it exists.
# The version of $progname that generated this script.
LTCONFIG_VERSION="$VERSION"
# Shell to use when invoking shell scripts.
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL="$SHELL"
-# Whether or not to build libtool libraries.
+# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
-# Whether or not to build old-style libraries.
+# Whether or not to build static libraries.
build_old_libs=$enable_static
# The host system.
host_alias="$host_alias"
host="$host"
+# An echo program that does not interpret backslashes.
+echo="$ltecho"
+
# The archiver.
AR="$AR"
# Compiler flag to allow reflexive dlopens.
export_dynamic_flag_spec="$export_dynamic_flag_spec"
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="$whole_archive_flag_spec"
+
# Library versioning type.
version_type=$version_type
# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
# the resulting binary.
hardcode_shlibpath_var=$hardcode_shlibpath_var
-
EOF
case "$host_os" in
aix3*)
- cat <<\EOF >> $ofile
+ cat <<\EOF >> "$ofile"
+
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
COLLECT_NAMES=
export COLLECT_NAMES
fi
-
EOF
;;
esac
+echo '### END LIBTOOL CONFIG' >> "$ofile"
+echo >> "$ofile"
+
# Append the ltmain.sh script.
-cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
+cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-chmod +x $ofile
+chmod +x "$ofile"
exit 0
# Local Variables:
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+# 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`($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
+
# The name of this program.
progname=`$echo "$0" | sed 's%^.*/%%'`
modename="$progname"
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.2
+VERSION=1.2b
default_mode=
help="Try \`$progname --help' for more information."
# 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).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+ save_LANG="$LANG"; LANG=C; export LANG
+fi
if test "$LTCONFIG_VERSION" != "$VERSION"; then
echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
exit 0
;;
+ --config)
+ sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
+ exit 0
+ ;;
+
+ --debug)
+ echo "$progname: enabling shell trace mode"
+ set -x
+ ;;
+
--dry-run | -n)
run=:
;;
esac
done
;;
- *db | *dbx)
+ *db | *dbx | *strace | *truss)
mode=execute
;;
*install*|cp|mv)
;;
-static)
- build_libtool_libs=no
build_old_libs=yes
continue
;;
# Just move the object, then go on to compile the next one
$show "$mv $obj $libobj"
- $run $mv $obj $libobj || exit 1
+ $run $mv $obj $libobj || exit $?
# Allow error messages only from the first compilation.
suppress_output=' >/dev/null 2>&1'
compile_shlibpath=
finalize_shlibpath=
+ convenience=
+ old_convenience=
deplibs=
dlfiles=
dlprefiles=
export_dynamic=no
+ generated=
hardcode_libdirs=
libobjs=
link_against_libtool_libs=
prev=
prevarg=
release=
- postfix=
rpath=
perm_rpath=
temp_rpath=
test -n "$old_archive_from_new_cmds" && build_old_libs=yes
# Go through the arguments, transforming them on the way.
- for arg
- do
+ while test $# -gt 0; do
+ arg="$1"
+ shift
+
# If the previous option needs an argument, assign it.
if test -n "$prev"; then
case "$prev" in
prev=
continue
;;
- postfix)
- postfix="-$arg"
- prev=
- continue
- ;;
rpath)
rpath="$rpath $arg"
prev=
-L*)
dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
case "$dir" in
- /* | [A-Za-z]:\\*)
+ /* | [A-Za-z]:[/\\]*)
# Add the corresponding hardcode_libdir_flag, if it is not identical.
;;
*)
continue
;;
- -postfix)
- prev=postfix
- continue
- ;;
-
-rpath)
prev=rpath
continue
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'`
+ dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/.o/'`
prev=
fi
libobjs="$libobjs $arg"
old_library=
# Check to see that this really is a libtool archive.
- if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
+ if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
else
$echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
exit 1
*) . ./$arg ;;
esac
- if test -z "$libdir"; then
- $echo "$modename: \`$arg' contains no -rpath information" 1>&2
- exit 1
- fi
-
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
dir="$dir/$objdir"
fi
+ if test -z "$libdir"; then
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $dir/$old_library"l
+ old_convenience="$old_convenience $dir/$old_library"
+ compile_command="$compile_command $dir/$old_library"
+ finalize_command="$finalize_command $dir/$old_library"
+ continue
+ fi
+
# This library was specified with -dlopen.
if test "$prev" = dlfiles; then
dlfiles="$dlfiles $arg"
fi
+ lib_linked=yes
case "$hardcode_action" in
- immediate)
+ immediate | unsupported)
if test "$hardcode_direct" = no; then
compile_command="$compile_command $dir/$linklib"
elif test "$hardcode_minus_L" = no; then
elif test "$hardcode_shlibpath_var" = no; then
compile_shlibpath="$compile_shlibpath$dir:"
compile_command="$compile_command -l$name"
+ else
+ lib_linked=no
fi
;;
relink)
# We need an absolute path.
case "$dir" in
- /* | [A-Za-z]:\\*) ;;
+ /* | [A-Za-z]:[/\\]*) ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
elif test "$hardcode_shlibpath_var" = yes; then
compile_shlibpath="$compile_shlibpath$dir:"
compile_command="$compile_command -l$name"
+ else
+ lib_linked=no
fi
;;
- *)
- $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
- exit 1
- ;;
+ *)
+ lib_linked=no
+ ;;
esac
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+ exit 1
+ fi
+
# Finalize command for both is simple: just hardcode it.
if test "$hardcode_direct" = yes; then
finalize_command="$finalize_command $libdir/$linklib"
exit 1
fi
- if test -n "$vinfo" && test -n "$release"; then
- $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2
- $echo "$help" 1>&2
- exit 1
- fi
-
- oldlib=
- oldobjs=
+ oldlibs=
case "$output" in
"")
$echo "$modename: you must specify an output file" 1>&2
*/* | *\\*)
$echo "$modename: output file \`$output' must have no directory components" 1>&2
+ $echo "$help" 1>&2
exit 1
;;
*.a)
+ if test -n "$link_against_libtool_libs"; then
+ $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
+ exit 1
+ fi
+
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles"; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+ fi
+
# Now set the variables for building old libraries.
build_libtool_libs=no
- build_old_libs=yes
- oldlib="$output"
- $show "$rm $oldlib"
- $run $rm $oldlib
+ oldlibs="$output"
;;
*.la)
case "$output" in
lib*) ;;
*)
- $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
$echo "$help" 1>&2
exit 1
;;
esac
- name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'`$postfix
+ name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
eval libname=\"$libname_spec\"
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
dlname=
- current=0
- revision=0
- age=0
if test -n "$objs"; then
$echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
# How the heck are we supposed to write a wrapper for a shared library?
if test -n "$link_against_libtool_libs"; then
- $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
+ $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
exit 1
fi
if test -n "$dlfiles$dlprefiles"; then
- $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
- # Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
- fi
-
- if test -z "$rpath"; then
- $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2
- $echo "$help" 1>&2
- exit 1
+ $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
fi
set dummy $rpath
fi
install_libdir="$2"
- # Parse the version information argument.
- IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
- set dummy $vinfo
- IFS="$save_ifs"
+ # Now set the variables for building old libraries.
+ oldlibs="$objdir/$libname.a"
+ if test -z "$rpath"; then
+ # Building a libtool convenience library.
+ oldlibs="$objdir/$libname.al $oldlibs"
+ build_libtool_libs=convenience
- if test -n "$5"; then
- $echo "$modename: too many parameters to \`-version-info'" 1>&2
- $echo "$help" 1>&2
- exit 1
- fi
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+ fi
- test -n "$2" && current="$2"
- test -n "$3" && revision="$3"
- test -n "$4" && age="$4"
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ fi
+ else
- # Check that each of the things are valid numbers.
- case "$current" in
- 0 | [1-9] | [1-9][0-9]*) ;;
- *)
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
- ;;
- esac
+ # Parse the version information argument.
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ IFS="$save_ifs"
- case "$revision" in
- 0 | [1-9] | [1-9][0-9]*) ;;
- *)
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
- ;;
- esac
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
- case "$age" in
- 0 | [1-9] | [1-9][0-9]*) ;;
- *)
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
- ;;
- esac
+ current="$2"
+ revision="$3"
+ age="$4"
- if test $age -gt $current; then
- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
- fi
+ # Check that each of the things are valid numbers.
+ case "$current" in
+ 0 | [1-9] | [1-9][0-9]*) ;;
+ *)
+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ ;;
+ esac
- # Calculate the version variables.
- version_vars="version_type current age revision"
- case "$version_type" in
- none) ;;
+ case "$revision" in
+ 0 | [1-9] | [1-9][0-9]*) ;;
+ *)
+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ ;;
+ esac
- linux)
- version_vars="$version_vars major versuffix"
- major=`expr $current - $age`
- versuffix="$major.$age.$revision"
- ;;
+ case "$age" in
+ 0 | [1-9] | [1-9][0-9]*) ;;
+ *)
+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ ;;
+ esac
- osf)
- version_vars="$version_vars versuffix verstring"
- major=`expr $current - $age`
- versuffix="$current.$age.$revision"
- verstring="$versuffix"
-
- # Add in all the interfaces that we are compatible with.
- loop=$age
- while test $loop != 0; do
- iface=`expr $current - $loop`
- loop=`expr $loop - 1`
- verstring="$verstring:${iface}.0"
- done
+ if test $age -gt $current; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ fi
- # Make executables depend on our current version.
- verstring="$verstring:${current}.0"
- ;;
+ # Calculate the version variables.
+ major=
+ versuffix=
+ verstring=
+ case "$version_type" in
+ none) ;;
- sunos)
- version_vars="$version_vars major versuffix"
- major="$current"
- versuffix="$current.$revision"
- ;;
+ linux)
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ ;;
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit 1
- ;;
- esac
+ osf)
+ major=`expr $current - $age`
+ versuffix=".$current.$age.$revision"
+ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+ while test $loop != 0; do
+ iface=`expr $current - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+ verstring="$verstring:${current}.0"
+ ;;
+
+ sunos)
+ major=".$current"
+ versuffix=".$current.$revision"
+ ;;
+
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit 1
+ ;;
+ esac
+
+ # Clear the version info if we defaulted, and they specified a release.
+ if test -z "$vinfo" && test -n "$release"; then
+ major=
+ versuffix=
+ verstring="0.0"
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+ if test "$allow_undefined" = yes; then
+ if test "$allow_undefined_flag" = unsupported; then
+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ build_libtool_libs=no
+ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+ allow_undefined_flag="$no_undefined_flag"
+ fi
+
+ # Add libc to deplibs on all systems.
+ dependency_libs="$deplibs"
+ deplibs="$deplibs -lc"
+ fi
# Create the output directory, or remove our outputs if we need to.
if test -d $objdir; then
- $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*"
- $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*
+ $show "${rm}r $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*"
+ $run ${rm}r $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*
else
$show "$mkdir $objdir"
$run $mkdir $objdir
- status=$?
- if test $status -eq 0 || test -d $objdir; then :
- else
- exit $status
- fi
- fi
-
- # Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
- build_libtool_libs=no
- build_old_libs=yes
+ status=$?
+ if test $status -ne 0 && test ! -d $objdir; then
+ exit $status
fi
- else
- # Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
fi
- # Add libc to deplibs on all systems.
- dependency_libs="$deplibs"
- deplibs="$deplibs -lc"
-
if test "$build_libtool_libs" = yes; then
- # Get the real and link names of the library.
- eval library_names=\"$library_names_spec\"
- set dummy $library_names
- realname="$2"
- shift; shift
-
- if test -n "$soname_spec"; then
- eval soname=\"$soname_spec\"
- else
- soname="$realname"
- fi
+ # Get the real and link names of the library.
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+ shift; shift
+
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
- lib="$objdir/$realname"
+ lib="$objdir/$realname"
for link
do
linknames="$linknames $link"
done
- # Use standard objects if they are PIC.
- test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
+ # Use standard objects if they are PIC.
+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
- # Do each of the archive commands.
- eval cmds=\"$archive_cmds\"
- IFS="${IFS= }"; save_ifs="$IFS"; IFS=';'
- for cmd in $cmds; do
- IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ # Transform .lo files to .o files.
+ test "$build_old_libs" = yes && oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
- # Create links to the real library.
- for linkname in $linknames; do
- $show "(cd $objdir && $LN_S $realname $linkname)"
- $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
- done
+ if test -n "$whole_archive_flag_spec"; then
+ if test -n "$convenience"; then
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ fi
+ else
+ for xlib in $convenience; do
+ # Extract the objects.
+ xdir="$xlib"x
+ generated="$generated $xdir"
+ xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
+ status=$?
+ if test $status -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ $show "(cd $xdir && $AR x ../$xlib)"
+ $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
- # If -export-dynamic was specified, set the dlname.
- if test "$export_dynamic" = yes; then
- # On all known operating systems, these are identical.
- dlname="$soname"
- fi
- fi
+ libobjs="$libobjs `echo $xdir/*`"
+ done
+ fi
- # Now set the variables for building old libraries.
- oldlib="$objdir/$libname.a"
+ # Do each of the archive commands.
+ eval cmds=\"$archive_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=';'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Create links to the real library.
+ for linkname in $linknames; do
+ if test "$realname" != "$linkname"; then
+ $show "(cd $objdir && $LN_S $realname $linkname)"
+ $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
+ fi
+ done
+
+ # If -export-dynamic was specified, set the dlname.
+ if test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+ dlname="$soname"
+ fi
+ fi
;;
*.lo | *.o)
if test -n "$link_against_libtool_libs"; then
- $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2
+ $echo "$modename: error: cannot link libtool libraries into objects" 1>&2
exit 1
fi
if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
fi
if test -n "$dlfiles$dlprefiles"; then
- $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2
- # Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
fi
if test -n "$rpath"; then
- $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2
+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
fi
if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2
+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
fi
if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
fi
case "$output" in
else
# Just create a symlink.
$show "$LN_S $obj $libobj"
- $run $LN_S $obj $libobj || exit 1
+ $run $LN_S $obj $libobj || exit $?
fi
exit 0
*)
if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2
+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
fi
if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
fi
if test -n "$rpath"; then
$show "$mkdir $objdir"
$run $mkdir $objdir
status=$?
- if test $status -eq 0 || test -d $objdir; then :
- else
+ if test $status -ne 0 && test ! -d $objdir; then
exit $status
fi
fi
finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'`
# Create the binary in the object directory, then wrap it.
- if test -d $objdir; then :
- else
+ if test ! -d $objdir; then
$show "$mkdir $objdir"
$run $mkdir $objdir
status=$?
- if test $status -eq 0 || test -d $objdir; then :
- else
+ if test $status -ne 0 && test ! -d $objdir; then
exit $status
fi
fi
rpath=
for dir in $temp_rpath; do
case "$dir" in
- /* | [A-Za-z]:\\*)
+ /* | [A-Za-z]:[/\\]*)
# Absolute path.
rpath="$rpath$dir:"
;;
finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
fi
- case "$hardcode_action" in
- relink)
+ if test "$hardcode_action" = relink; then
# AGH! Flame the AIX and HP-UX people for me, will ya?
$echo "$modename: warning: using a buggy system linker" 1>&2
$echo "$modename: relinking will be required before \`$output' can be installed" 1>&2
- ;;
- esac
+ fi
$show "$compile_command"
$run eval "$compile_command" || exit $?
trap "$rm $output; exit 1" 1 2 15
$echo > $output "\
-#! /bin/sh
+#! $SHELL
# $output - temporary wrapper script for $objdir/$output
-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
finalize_command=\"$finalize_command\"
else
# When we are sourced in execute mode, \$file and \$echo are already set.
- if test \"\$libtool_execute_magic\" = \"$magic\"; then :
- else
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
echo=\"$qecho\"
file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$echo works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$echo will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
fi\
"
$echo >> $output "\
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
case \"\$destdir\" in
- /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;;
+ /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;;
*) thisdir=\"\$thisdir/\$destdir\" ;;
esac
fi
esac
# See if we need to build an old-fashioned archive.
- if test "$build_old_libs" = "yes"; then
- # Transform .lo files to .o files.
- oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
+ for oldlib in $oldlibs; do
+
+ if test "$build_libtool_libs" = convenience; then
+ oldobjs="$libobjs"
+ addlibs="$convenience"
+ build_libtool_libs=no
+ else
+ addlibs="$old_convenience"
+ fi
+
+ # Add in members from convenience archives.
+ for xlib in $addlibs; do
+ # Extract the objects.
+ xdir="$xlib"x
+ generated="$generated $xdir"
+ xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
+ status=$?
+ if test $status -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ $show "(cd $xdir && $AR x ../$xlib)"
+ $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
+
+ oldobjs="$oldobjs `echo $xdir/*`"
+ done
# Do each command in the archive commands.
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
$run eval "$cmd" || exit $?
done
IFS="$save_ifs"
+ done
+
+ if test -n "$generated"; then
+ $show "${rm}r$generated"
+ $run ${rm}r$generated
fi
# Now create the libtool archive.
*.la)
old_library=
test "$build_old_libs" = yes && old_library="$libname.a"
-
$show "creating $output"
# Only create the output if not a dry run.
if test -z "$run"; then
$echo > $output "\
# $output - a libtool library file
-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
# The name that we can dlopen(3).
dlname='$dlname'
# Do a symbolic link so that the libtool archive can be found in
# LD_LIBRARY_PATH before the program is installed.
$show "(cd $objdir && $LN_S ../$output $output)"
- $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1
+ $run eval "(cd $objdir && $LN_S ../$output $output)" || exit $?
;;
esac
exit 0
install)
modename="$modename: install"
- # There may be an optional /bin/sh argument at the beginning of
+ # There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL"; then
# Aesthetically quote it.
opts=
prev=
install_type=
- isdir=
+ isdir=no
stripme=
for arg
do
# Check to see that the destination is a directory.
test -d "$dest" && isdir=yes
- if test -n "$isdir"; then
+ if test "$isdir" = yes; then
destdir="$dest"
destname=
else
fi
fi
case "$destdir" in
- /* | [A-Za-z]:\\*) ;;
+ /* | [A-Za-z]:[/\\]*) ;;
*)
for file in $files; do
case "$file" in
*.la)
# Check to see that this really is a libtool archive.
- if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
# Deduce the name of the destination old-style object file.
case "$destfile" in
*.lo)
- staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'`
+ staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/.o/'`
;;
*.o)
staticdest="$destfile"
# Install the old object if enabled.
if test "$build_old_libs" = yes; then
# Deduce the name of the old-style object file.
- staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'`
+ staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/.o/'`
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
;;
*)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
# Do a test to see if this is really a libtool program.
- if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
link_against_libtool_libs=
finalize_command=
esac
fi
libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- if test -z "$libdir"; then
- $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
- elif test -f "$libfile"; then :
- else
+ if test -n "$libdir" && test ! -f "$libfile"; then
$echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
finalize=no
fi
fi
fi
- $show "$install_prog$stripme $file $dest"
- $run eval "$install_prog\$stripme \$file \$dest" || exit $?
+ $show "$install_prog$stripme $file $destfile"
+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
;;
esac
done
finish)
modename="$modename: finish"
libdirs="$nonopt"
+ admincmds=
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
for dir
for cmd in $cmds; do
IFS="$save_ifs"
$show "$cmd"
- $run eval "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
done
IFS="$save_ifs"
fi
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $run eval "$cmds"
+ $run eval "$cmds" || admincmds="$admincmds
+ $cmds"
fi
done
fi
- echo "------------------------------------------------------------------------------"
+ echo "----------------------------------------------------------------------"
echo "Libraries have been installed in:"
for libdir in $libdirs; do
echo " $libdir"
echo "To link against installed libraries in a given directory, LIBDIR,"
echo "you must use the \`-LLIBDIR' flag during linking."
echo
- echo " You will also need to do one of the following:"
+ echo " You will also need to 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"
echo " - use the \`$flag' linker flag"
fi
+ if test -n "$admincmds"; then
+ echo " - have your system administrator run these commands:$admincmds"
+ fi
if test -f /etc/ld.so.conf; then
echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
fi
echo
echo "See any operating system documentation about shared libraries for"
echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "------------------------------------------------------------------------------"
+ echo "----------------------------------------------------------------------"
exit 0
;;
# Handle -dlopen flags immediately.
for file in $execute_dlfiles; do
- if test -f "$file"; then :
- else
+ if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
exit 1
case "$file" in
*.la)
# Check to see that this really is a libtool archive.
- if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
-*) ;;
*)
# Do a test to see if this is really a libtool program.
- if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
# If there is no directory component, then add one.
case "$file" in
*/* | *\\*) . $file ;;
# Export the shlibpath_var.
eval "export $shlibpath_var"
+ # Restore saved enviroment variables
+ if test "${save_LC_ALL+set}" = set; then
+ LC_ALL="$save_LC_ALL"; export LC_ALL
+ fi
+ if test "${save_LANG+set}" = set; then
+ LANG="$save_LANG"; export LANG
+ fi
+
# Now actually exec the command.
eval "exec \$cmd$args"
case "$name" in
*.la)
# Possibly a libtool archive, so verify it.
- if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
. $dir/$name
# Delete the libtool libraries and symlinks.
*.lo)
if test "$build_old_libs" = yes; then
- oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'`
+ oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/.o/'`
rmfiles="$rmfiles $dir/$oldobj"
fi
$show "$rm $rmfiles"
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 configuration information and exit
+ --features display basic configuration information and exit
--finish same as \`--mode=finish'
--help display this help message and exit
--mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
Compile a source file into a libtool library object.
+This mode accepts the following additional options:
+
+ -static always build a \`.o' file suitable for static linking
+
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
projects / ~andy / gtk / commitdiff