Commit b800763e authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

use X_CFLAGS when checking for Xmu headers too

2002-09-18  Manish Singh  <yosh@gimp.org>

        * configure.in: use X_CFLAGS when checking for Xmu headers too

        * tools/pdbgen/pdb/channel.pdb
        * tools/pdbgen/pdb/layer.pdb: slight tweak to mitch's change
        to have default parameters for the common case
parent 737754c4
2002-09-18 Manish Singh <yosh@gimp.org>
* configure.in: use X_CFLAGS when checking for Xmu headers too
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/layer.pdb: slight tweak to mitch's change
to have default parameters for the common case
2002-09-18 Sven Neumann <sven@gimp.org>
* configure.in: use X_CFLAGS when checking for xpm.h.
......
......@@ -550,7 +550,9 @@ gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
if test "$gdk_target" = x11; then
dnl Test for Xmu
if test -z "$LIBXMU"; then
gimp_save_CFLAGS="$CFLAGS"
gimp_save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
AC_CHECK_LIB(Xmu, XmuClientWindow,
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
......@@ -565,6 +567,7 @@ if test "$gdk_target" = x11; then
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU header file not found) ***)])],
AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU library not found) ***), -lXt)], -lXt)
CFLAGS="$gimp_save_CFLAGS"
LDFLAGS="$gimp_save_LDFLAGS"
fi
else
......
......@@ -32,6 +32,9 @@ sub operation_arg () {{
sub channel_get_prop_proc {
my ($prop, $type, $desc, $func, $core_type, $core_var) = @_;
$core_type = 'channel' unless $core_type;
$core_var = 'channel' unless $core_var;
$blurb = "Get the $desc of the specified channel.";
$help = "This procedure returns the specified channel's $desc. ";
......@@ -66,6 +69,9 @@ CODE
sub channel_set_prop_proc {
my ($prop, $type, $desc, $func, $core_type, $core_var) = @_;
$core_type = 'channel' unless $core_type;
$core_var = 'channel' unless $core_var;
$blurb = "Set the $desc of the specified channel.";
$help = "This procedure sets the specified channel's $desc. ";
......@@ -106,7 +112,11 @@ CODE
}
sub channel_accessors {
my ($prop, $type, $desc, $func, $core_type, $core_var, $extra) = @_;
my ($prop, $type, $desc, $func, $extra, $core_type, $core_var) = @_;
$core_type = 'channel' unless $core_type;
$core_var = 'channel' unless $core_var;
my (@extra, %extra); my $once = 0;
ref($extra) ? (@extra = @$extra) : (@extra = ($extra, $extra));
......@@ -254,14 +264,13 @@ HELP
CODE
}
&channel_accessors('name', 'string', 'name', 1,
&channel_accessors('name', 'string', 'name', 1, undef,
'object', 'GIMP_OBJECT (channel)');
&channel_accessors('visible', 'boolean', 'visibility', 1,
&channel_accessors('visible', 'boolean', 'visibility', 1, undef,
'drawable', 'GIMP_DRAWABLE (channel)');
&channel_accessors('show_masked', 'boolean', 'composite method', 1,
'channel', 'channel',
<<'CODE');
$help .= <<'HELP'
If it is non-zero, then the channel is composited with the image so that masked
......@@ -270,19 +279,16 @@ HELP
CODE
&channel_accessors('opacity', '0 <= float <= 100', 'opacity', 0,
'channel', 'channel',
[ '$outargs[0]->{alias} =
"channel->color.a * 100.0"',
'$invoke{code} =~
s%(color.a);$%(($1 / 100.0);%' ]);
&channel_accessors('color', 'color', 'compositing color', 0,
'channel', 'channel',
[ '$outargs[0]->{void_ret} = 1', '' ]);
&channel_accessors('tattoo', 'tattoo', 'tattoo', 1,
'item', 'GIMP_ITEM (channel)',
<<'CODE');
<<'CODE', 'item', 'GIMP_ITEM (channel)');
$help .= <<'HELP';
A tattoo is a unique and permanent identifier attached to a channel that can be
used to uniquely identify a channel within an image even between sessions.
......
......@@ -109,6 +109,9 @@ HELP
sub layer_get_prop_proc {
my ($prop, $type, $desc, $func, $core_type, $core_var) = @_;
$core_type = 'layer' unless $core_type;
$core_var = 'layer' unless $core_var;
$blurb = "Get the $desc of the specified layer.";
$help = "This procedure returns the specified layer's $desc. ";
......@@ -143,6 +146,9 @@ sub layer_get_prop_proc {
sub layer_set_prop_proc {
my ($prop, $type, $desc, $func, $core_type, $core_var) = @_;
$core_type = 'layer' unless $core_type;
$core_var = 'layer' unless $core_var;
$blurb = "Set the $desc of the specified layer.";
$help = "This procedure sets the specified layer's $desc. ";
......@@ -174,7 +180,11 @@ CODE
}
sub layer_accessors {
my ($prop, $type, $desc, $func, $setting, $core_type, $core_var, $extra) = @_;
my ($prop, $type, $desc, $func, $setting, $extra, $core_type, $core_var) = @_;
$core_type = 'layer' unless $core_type;
$core_var = 'layer' unless $core_var;
my (@extra, %extra); my $once = 0;
my $change = "s/ ($desc)/'s \$1 setting/";
......@@ -480,17 +490,15 @@ HELP
);
}
&layer_accessors('name', 'string', 'name', 1, 0,
&layer_accessors('name', 'string', 'name', 1, 0, undef,
'object', 'GIMP_OBJECT (layer)');
&layer_accessors('visible', 'boolean', 'visibility', 1, 0,
&layer_accessors('visible', 'boolean', 'visibility', 1, 0, undef,
'drawable', 'GIMP_DRAWABLE (layer)');
&layer_accessors('preserve_trans', 'boolean', 'preserve transperancy', 1, 1,
'layer', 'layer');
&layer_accessors('preserve_trans', 'boolean', 'preserve transperancy', 1, 1);
&layer_accessors('apply_mask', 'boolean', 'apply mask', 1, 0,
'layer', 'layer',
[ <<'CODE1', <<'CODE2' ]);
$help .= <<'HELP';
If the value is non-zero, then the layer mask for this layer is currently being
......@@ -504,7 +512,6 @@ HELP
CODE2
&layer_accessors('show_mask', 'boolean', 'show mask', 1, 0,
'layer', 'layer',
[ <<'CODE1', <<'CODE2' ]);
$help .= <<'HELP';
If the value is non-zero, then the layer mask for this layer is currently being
......@@ -519,7 +526,6 @@ HELP
CODE2
&layer_accessors('edit_mask', 'boolean', 'show mask', 1, 0,
'layer', 'layer',
[ <<'CODE1', <<'CODE2' ]);
$help .= <<'HELP';
If the value is non-zero, then the layer mask for this layer is currently
......@@ -534,17 +540,14 @@ HELP
CODE2
&layer_accessors('opacity', '0 <= float <= 100', 'opacity', 1, 0,
'layer', 'layer',
[ '$outargs[0]->{alias} =
"gimp_layer_get_opacity (layer) * 100.0"',
'$invoke{code} =~
s%opacity\);%opacity / 100.0\);%' ]);
&layer_accessors('mode', 'enum GimpLayerModeEffects', 'combination mode', 1, 0,
'layer', 'layer');
&layer_accessors('mode', 'enum GimpLayerModeEffects', 'combination mode', 1, 0);
&layer_accessors('linked', 'boolean', 'linked state', 1, 0,
'layer', 'layer',
<<'CODE');
$author = $copyright = 'Wolfgang Hofer';
$date = '1998';
......@@ -555,8 +558,7 @@ CODE2
CODE
&layer_accessors('tattoo', 'tattoo', 'tattoo', 1, 0,
'item', 'GIMP_ITEM (layer)',
<<'CODE');
<<'CODE', 'item', 'GIMP_ITEM (layer)');
$help .= <<'HELP';
A tattoo is a unique and permanent identifier attached to a
layer that can be used to uniquely identify a layer within an image even between sessions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment