diff --git a/12_fix-tile.dpatch b/12_fix-tile.dpatch index 9135742..cb78666 100644 --- a/12_fix-tile.dpatch +++ b/12_fix-tile.dpatch @@ -1,5 +1,5 @@ #! /bin/sh -e -## 12_fix-tile.dpatch by Rémi Guyomarch (via FreeBSD & OpenBSD) +## 12_fix-tile.dpatch by Rémi Guyomarch (via FreeBSD & OpenBSD) ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix -tile for images smaller than the screen. diff --git a/22-include.patch b/22-include.patch deleted file mode 100644 index be4c995..0000000 --- a/22-include.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Jari Aalto -Subject: Add include for functions like strcat() etc. - ---- - autoconfig.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/autoconfig.c -+++ b/autoconfig.c -@@ -5,6 +5,7 @@ - * jim frost 09.05.93 - */ - -+#include - #include - #include - #include diff --git a/27_shrink-should-not-zoom-upwards.patch b/27_shrink-should-not-zoom-upwards.patch deleted file mode 100644 index 1bbd6a2..0000000 --- a/27_shrink-should-not-zoom-upwards.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Do not resize images that are smaller than the screen with -shrink - Shrink does also zoom upwards for images which are smaller than - the screen. The following patch fixes this, images smaller as the - screen are left at 100% zoom. -Author: David Frey -Forwarded: no -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=381382 ---- a/xloadimage.c -+++ b/xloadimage.c -@@ -408,6 +408,9 @@ int main(argc, argv) - / (float)newimage->width * 100.0 : - ((float)DisplayHeight(disp, scrn) * 0.9) - / (float)newimage->height * 100.0); -+ if ((opt->info.zoom.x > 100) || (opt->info.zoom.y > 100)) -+ opt->info.zoom.x=opt->info.zoom.y=100; -+ - addOption(optset, opt); - } - diff --git a/28_correct-scaling-fullscreen.patch b/28_correct-scaling-fullscreen.patch deleted file mode 100644 index 83ec7ec..0000000 --- a/28_correct-scaling-fullscreen.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: -fullscreen option behaves incorrectly if one of the - images' dimensions is bigger than screen, but the other is not. It's - caused by a forgotten typecast from uint to int. -Author: Anton Khirnov -Forwarded: no -Bug-Debisn: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=506343 ---- a/xloadimage.c -+++ b/xloadimage.c -@@ -379,8 +379,8 @@ int main(argc, argv) - if ((newimage->width > DisplayWidth(disp, scrn)) || - (newimage->height > DisplayHeight(disp, scrn))) { - opt->info.zoom.x= opt->info.zoom.y= -- (newimage->width - DisplayWidth(disp, scrn) > -- newimage->height - DisplayHeight(disp, scrn) ? -+ ((int)newimage->width - DisplayWidth(disp, scrn) > -+ (int)newimage->height - DisplayHeight(disp, scrn) ? - (float)DisplayWidth(disp, scrn) / (float)newimage->width * 100.0 : - (float)DisplayHeight(disp, scrn) / (float)newimage->height * 100.0); - } diff --git a/29_fix-manpage-hyphens.patch b/29_fix-manpage-hyphens.patch deleted file mode 100644 index e7bfb85..0000000 --- a/29_fix-manpage-hyphens.patch +++ /dev/null @@ -1,718 +0,0 @@ -Description: Use explicit hyphens/minus signs in man page to - allow for copy&pasting options in Unicode environments. -Author: Dominik George -Forwarded: no ---- a/uufilter.man -+++ b/uufilter.man -@@ -2,7 +2,7 @@ - .SH NAME - uufilter - decode uuencoded files to stdout - .SH SYNOPSIS --\fIuufilter\fR [-f \fIoutfilename\fR] [-l] [-s] [-v] [\fIinfilename\fR] -+\fIuufilter\fR [\-f \fIoutfilename\fR] [\-l] [\-s] [\-v] [\fIinfilename\fR] - .SH DESCRIPTION - \fIUufilter\fR is a "smart" uuencoded file decoder that can optionally - dump the file to stdout. -@@ -16,19 +16,19 @@ without stripping off the headers or oth - content. - .SH OPTIONS - .TP 8 ---f \fIfilename\fR -+\-f \fIfilename\fR - Dump output to \fIfilename\fR rather than the name specified in the - uuencoded file. - .TP ---l -+\-l - Lenient mode. This is useful if passed through a mailer that adds - trailing spaces. - .TP ---s -+\-s - Dump output to stdout rather than to the filename indicated in the - uuencoded file. - .TP ---v -+\-v - Verbose mode; talks about what's going on. - .SH AUTHOR - Jim Frost (jimf@centerline.com) ---- a/xloadimage.man -+++ b/xloadimage.man -@@ -9,7 +9,7 @@ the root window - .SH DESCRIPTION - \fIXloadimage\fR displays images in an X11 window, loads them onto the - root window, or writes them into a file. Many image types are --recognized; use the \fI-supported\fR option to list them. -+recognized; use the \fI\-supported\fR option to list them. - .PP - If the filename \fIstdin\fR is given, xloadimage will read the image - from standard input if this capability is supported by the loader for -@@ -18,38 +18,38 @@ that image type (most types do support r - If the destination display cannot support the number of colors in the - image, the image will be dithered (monochrome destination) or have its - colormap reduced (color destination) as appropriate. This can also be --done forcibly with the \fI-halftone\fR, \fI-dither\fR, and --\fI-colors\fR options. -+done forcibly with the \fI\-halftone\fR, \fI\-dither\fR, and -+\fI\-colors\fR options. - .PP - A variety of image manipulations can be specified, including gamma --correction, brightening, clipping, dithering, depth-reduction, -+correction, brightening, clipping, dithering, depth\(hyreduction, - rotation, and zooming. Most of these manipulations have simple - implementations; speed was opted for above accuracy. - .PP - If you are viewing a large image in a window, the initial window will - be at most 90% of the size of the display unless the window manager - does not correctly handle window size requests or if you've used the --\fI-fullscreen\fR option. You may move the image around in the window -+\fI\-fullscreen\fR option. You may move the image around in the window - by dragging with the first mouse button. The cursor will indicate - which directions you may drag, if any. You may exit the window by - typing 'q' or '^C' when the keyboard focus is on the window. - .PP - If more than one image file is specified on the command line, each --image will be shown in order (except if \fI-merge\fR or \fI-goto\fR -+image will be shown in order (except if \fI\-merge\fR or \fI\-goto\fR - are being used). - .PP - A wide variety of common image manipulations can be done by mixing and - matching the available options. See the section entitled \fIHINTS FOR - GOOD IMAGE DISPLAYS\fR for some ideas. - .PP --The \fI-dump\fR option causes an image to be written to a file rather -+The \fI\-dump\fR option causes an image to be written to a file rather - than displayed after processing. This allows you to read an image, - perform a number of processing operations on it, and save the - resultant image. This also allows translation from any of the - recognized image types into any of the formats that support dumping. - .PP --\fIXsetbg\fR is equivalent to \fIxloadimage -onroot -quiet\fR and --\fIxview\fR is equivalent to \fIxloadimage -view -verbose\fR. -+\fIXsetbg\fR is equivalent to \fIxloadimage \-onroot \-quiet\fR and -+\fIxview\fR is equivalent to \fIxloadimage \-view \-verbose\fR. - .SH RESOURCE CLASS - \fIXloadimage\fR uses the resource class name \fIXloadimage\fR for - window managers which need this resource set. This name changed -@@ -59,58 +59,58 @@ in version 2.00 and 2.01; some previous - .SH GLOBAL OPTIONS - The following options affect the global operation of \fIxloadimage\fR. - They may be specified anywhere on the command line. Additionally the --\fI-global\fR option can be used to force an image option to apply to -+\fI\-global\fR option can be used to force an image option to apply to - all images. - .TP 8 ---border \fIcolor\fR -+\-border \fIcolor\fR - This sets the background portion of the window which is not covered by - any images to be \fIcolor\fR. - .TP ---configuration -+\-configuration - Displays the image path, image suffixes, and supported filters which - will be used when looking for and reading images. These are loaded - from ~/.xloadimagerc and optionally from a systemwide file (normally --/usr/lib/xloadimagerc). This replaces the -path option. -+/usr/lib/xloadimagerc). This replaces the \-path option. - .TP ---default -+\-default - Use the default root weave as the image. This option forces --\fI-onroot\fR. If \fI-default\fR is used alone, it is the same as -+\fI\-onroot\fR. If \fI\-default\fR is used alone, it is the same as - \fIxsetroot\fR with no arguments. If used in conjunction with --\fI-tile\fR this option can be used to place images on the default -+\fI\-tile\fR this option can be used to place images on the default - root weave (see \fBEXAMPLES\fR below). - .TP ---debug -+\-debug - Talk to the X server in synchronous mode. This is useful for - debugging. If an X error is seen while in this mode, a core will be - dumped. - .TP ---display \fIdisplay_name\fR -+\-display \fIdisplay_name\fR - X11 display name to send the image(s) to. - .TP ---dump \fIimage_type[,option[=value]]\fR \fIdump_file\fR -+\-dump \fIimage_type[,option[=value]]\fR \fIdump_file\fR - Rather than displaying the loaded and processed image, dump it into an - image file of the specified type. For a list of image types that can --be dumped, use the \fI-supported\fR option. Some image types have -+be dumped, use the \fI\-supported\fR option. Some image types have - options that affect the format of the file that's created. See - \fBDUMP OPTIONS\fR below. An image can be dumped in any supported - dump format regardless of the original image type, so image file type - translation is possible using this option. - .TP ---fit -+\-fit - Force image to use the default visual and colormap. This is useful if - you do not want technicolor effects when the colormap focus is inside - the image window, but it may reduce the quality of the displayed --image. This is on by default if -onroot or -windowid is specified. -+image. This is on by default if \-onroot or \-windowid is specified. - .TP ---fork -+\-fork - Fork xloadimage. This causes xloadimage to disassociate itself from --the shell. This option automatically turns on -quiet. -+the shell. This option automatically turns on \-quiet. - .TP ---fullscreen --Use the entire screen to display images. If combined with -onroot, -+\-fullscreen -+Use the entire screen to display images. If combined with \-onroot, - the image will be zoomed to fill the entire rootwindow. - .TP ---geometry \fIWxH[{+-X}{+-}Y]\fR -+\-geometry \fIWxH[{+\-X}{+\-}Y]\fR - This sets the size of the window onto which the images are loaded to a - different value than the size of the image. When viewing an image in - a window, this can be used to reduce the size of the destination -@@ -119,226 +119,226 @@ controls the size of the pixmap which wi - If the size is smaller than that of the display, the image will be - replicated. - .TP ---goto image_name -+\-goto image_name - Forces the next image to be displayed to be the image named - \fIimage_name\fR. This is useful for generating looped slideshows. - If more than one image of the same name as the target exists on the - argument list, the first in the argument list is used. - .TP ---help [option ...] -+\-help [option ...] - Give information on an option or list of options. If no option is - given, a simple interactive help facility is invoked. - .TP ---identify -+\-identify - Identify the supplied images rather than display them. - .TP ---install -+\-install - Forcibly install the image's colormap when the window is focused. - This violates ICCCM standards and only exists to allow operation with - naive window managers. Use this option only if your window manager - does not install colormaps properly. - .TP ---list -+\-list - List the images which are along the image path. - .TP ---onroot -+\-onroot - Load image(s) onto the root window instead of viewing in a window. --This option automatically sets the -fit option. --This is the opposite of \fI-view\fR. \fIXSetbg\fR has this option set -+This option automatically sets the \-fit option. -+This is the opposite of \fI\-view\fR. \fIXSetbg\fR has this option set - by default. - .TP ---path -+\-path - Displays miscellaneous information about the program configuration. --This option is obsolete and has been replaced by -configuration. -+This option is obsolete and has been replaced by \-configuration. - .TP ---pixmap --Force the use of a pixmap as backing-store. This is provided for --servers where backing-store is broken (such as some versions of the -+\-pixmap -+Force the use of a pixmap as backing\(hystore. This is provided for -+servers where backing\(hystore is broken (such as some versions of the - AIXWindows server). It may improve scrolling performance on servers --which provide backing-store. -+which provide backing\(hystore. - .TP ---private -+\-private - Force the use of a private colormap. Normally colors are allocated - shared unless there are not enough colors available. - .TP ---quiet -+\-quiet - Forces \fIxloadimage\fR and \fIxview\fR to be quiet. This is the - default for \fIxsetbg\fR, but the others like to whistle. - .TP ---supported -+\-supported - List the supported image types. - .TP ---type \fItype_name\fR -+\-type \fItype_name\fR - Forces \fIxloadimage\fR to try to load the image as a particular file - type rather than trying to guess. This often improves load - performance noticeably. - .TP ---verbose -+\-verbose - Causes \fIxloadimage\fR to be talkative, telling you what kind of - image it's playing with and any special processing that it has to do. - This is the default for \fIxview\fR and \fIxloadimage\fR. - .TP ---version -+\-version - Print the version number and patchlevel of this version of - \fIxloadimage\fR. - .TP ---view --View image(s) in a window. This is the opposite of \fI-onroot\fR and -+\-view -+View image(s) in a window. This is the opposite of \fI\-onroot\fR and - the default for \fIxview\fR and \fIxloadimage\fR. - .TP ---visual \fIvisual_name\fR -+\-visual \fIvisual_name\fR - Force the use of a specific visual type to display an image. Normally - \fIxloadimage\fR tries to pick the best available image for a - particular image type. The available visual types are: DirectColor, - TrueColor, PseudoColor, StaticColor, GrayScale, and StaticGray. - Nonconflicting names may be abbreviated and case is ignored. - .TP ---windowid \fIhex_window_id\fR -+\-windowid \fIhex_window_id\fR - Sets the background pixmap of a particular window ID. The argument - must be in hexadecimal and must be preceded by "0x" (\fIeg\fR ---windowid 0x40000b. This is intended for setting the background -+\-windowid 0x40000b. This is intended for setting the background - pixmap of some servers which use untagged virtual roots - (\fIeg\fR HP-VUE), but can have other interesting applications. - .SH IMAGE OPTIONS - The following options may precede each image. These options are - local to the image they precede. - .TP ---at \fIX\fR,\fIY\fR -+\-at \fIX\fR,\fIY\fR - Indicates coordinates to load the image at on the base image. If --this is an option to the first image, and the \fI-onroot\fR option is -+this is an option to the first image, and the \fI\-onroot\fR option is - specified, the image will be loaded at the given location on the - display background. - .TP ---background \fIcolor\fR -+\-background \fIcolor\fR - Use \fIcolor\fR as the background color instead of the default - (usually white but this depends on the image type) if you are - transferring a monochrome image to a color display. - .TP ---brighten \fIpercentage\fR -+\-brighten \fIpercentage\fR - Specify a percentage multiplier for a color image's colormap. A value - of more than 100 will brighten an image, one of less than 100 will - darken it. - .TP ---center -+\-center - Center the image on the base image loaded. If this is an option to - the first image, and the \fI-onroot\fR option is specified, the image - will be centered on the display background. - .TP ---clip \fIX\fR,\fIY\fR,\fIW\fR,\fIH\fR -+\-clip \fIX\fR,\fIY\fR,\fIW\fR,\fIH\fR - Clip the image before loading it. \fIX\fR and \fIY\fR define the --upper-left corner of the clip area, and \fIW\fR and \fIH\fR define the -+upper\(hyleft corner of the clip area, and \fIW\fR and \fIH\fR define the - extents of the area. A zero value for \fIW\fR or \fIH\fR will be - interpreted as the remainder of the image. - .TP ---colors \fIn\fR -+\-colors \fIn\fR - Specify the maximum number of colors to use in the image. This is a - way to forcibly reduce the depth of an image. - .TP ---delay \fIsecs\fR -+\-delay \fIsecs\fR - Automatically advance to the next image after \fIsecs\fR seconds. You --may want to use the \fI-global\fR switch with this command to create a -+may want to use the \fI\-global\fR switch with this command to create a - slideshow with multiple images. - .TP ---dither --Dither a color image to monochrome using a Floyd-Steinberg dithering -+\-dither -+Dither a color image to monochrome using a Floyd\(hySteinberg dithering - algorithm. This happens by default when viewing color images on a --monochrome display. This is slower than \fI-halftone\fR and affects -+monochrome display. This is slower than \fI\-halftone\fR and affects - the image accuracy but usually looks much better. - .TP ---foreground \fIcolor\fR -+\-foreground \fIcolor\fR - Use \fIcolor\fR as the foreground color instead of black if you are - transferring a monochrome image to a color display. This can also be - used to invert the foreground and background colors of a monochrome - image. - .TP ---gamma \fIdisplay_gamma\fR -+\-gamma \fIdisplay_gamma\fR - Specify the gamma correction for the display. - The default value is 1.0, a typical display needs 2.0 to 2.5. - .TP ---global -+\-global - Force the following option to apply to all images rather than one - specific image. Local image options will temporarily override any --option specified with -global. -+option specified with \-global. - .TP ---gray -+\-gray - Convert an image to grayscale. This is very useful when displaying - colorful images on servers with limited color capability. It can also - be used to convert a bitmap image into a grayscale image, although the - resulting image will be smaller than the original. The optional --spelling \fI-grey\fR may also be used. -+spelling \fI\-grey\fR may also be used. - .TP ---halftone -+\-halftone - Force halftone dithering of a color image when displaying on a - monochrome display. This option is ignored on monochrome images. - This dithering algorithm blows an image up by sixteen times; if you --don't like this, the \fI-dither\fR option will not blow the image up -+don't like this, the \fI\-dither\fR option will not blow the image up - but will take longer to process and will be less accurate. - .TP ---idelay \fIsecs\fR -+\-idelay \fIsecs\fR - This option is no longer supported due to the addition of --\fI-global\fR. The same functionality can be had with \fI-delay\fR. -+\fI\-global\fR. The same functionality can be had with \fI\-delay\fR. - .TP ---invert --Inverts a monochrome image. This is shorthand for \fI-foreground --white -background black\fR. -+\-invert -+Inverts a monochrome image. This is shorthand for \fI\-foreground -+white \-background black\fR. - .TP ---merge -+\-merge - Merge this image onto the base image after local processing. The base - image is considered to be the first image specified or the last image --that was not preceded by \fI-merge\fR. If used in conjunction with --\fI-at\fR and \fI-clip\fR, very complex images can be built up. This --option is on by default for all images if the \fI-onroot\fR or --\fI-windowid\fR options are specified. -+that was not preceded by \fI\-merge\fR. If used in conjunction with -+\fI\-at\fR and \fI\-clip\fR, very complex images can be built up. This -+option is on by default for all images if the \fI\-onroot\fR or -+\fI\-windowid\fR options are specified. - .TP ---name \fIimage_name\fR -+\-name \fIimage_name\fR - Force the next argument to be treated as an image name. This is --useful if the name of the image is \fI-dither\fR, for instance. -+useful if the name of the image is \fI\-dither\fR, for instance. - .TP ---newoptions -+\-newoptions - Reset globally-specified options. - .TP ---normalize -+\-normalize - Normalize a color image. - .TP ---rotate \fIdegrees\fR -+\-rotate \fIdegrees\fR - Rotate the image by \fIdegrees\fR clockwise. The number must be a - multiple of 90. - .TP ---shrink -+\-shrink - Shrink an image down to fit on the display. This is particularly - useful with servers that do not support window sizes larger than the - physical screen (eg DECWINDOWS servers). - .TP ---smooth -+\-smooth - Smooth a color image. This reduces blockiness after zooming an image - up. If used on a monochrome image, nothing happens. This option can - take awhile to perform, especially on large images. You may specify --more than one \fI-smooth\fR option per image, causing multiple -+more than one \fI\-smooth\fR option per image, causing multiple - iterations of the smoothing algorithm. - .TP ---tile -+\-tile - Tile this image (after any necessary merging or tiling) to create a - fullscreen image. This is usually used to create a large background --image on which to merge other images. \fI-geometry\fR can be used to --set the new image size to something other than -fullscreen. -+image on which to merge other images. \fI\-geometry\fR can be used to -+set the new image size to something other than \-fullscreen. - .TP ---title \fItitle\fR -+\-title \fItitle\fR - Change the title of the image. This sets the title bar title if - displaying in a window or the NIFF file image title if dumping the - image. - .TP ---xzoom \fIpercentage\fR -+\-xzoom \fIpercentage\fR - Zoom the X axis of an image by \fIpercentage\fR. A number greater - than 100 will expand the image, one smaller will compress it. A zero --value will be ignored. This option, and the related \fI-yzoom\fR are -+value will be ignored. This option, and the related \fI\-yzoom\fR are - useful for correcting the aspect ratio of images to be displayed. - .TP ---yzoom \fIpercentage\fR --Zoom the Y axis of an image by \fIpercentage\fR. See \fI-xzoom\fR for -+\-yzoom \fIpercentage\fR -+Zoom the Y axis of an image by \fIpercentage\fR. See \fI\-xzoom\fR for - more information. - .TP ---zoom \fIpercentage\fR --Zoom both the X and Y axes by \fIpercentage\fR. See \fI-xzoom\fR for -+\-zoom \fIpercentage\fR -+Zoom both the X and Y axes by \fIpercentage\fR. See \fI\-xzoom\fR for - more information. Technically the percentage actually zoomed is the - square of the number supplied since the zoom is to both axes, but I - opted for consistency instead of accuracy. -@@ -347,80 +347,80 @@ To load the rasterfile "my.image" onto t - it to fill the entire background: - .sp - .ti +5 --xloadimage -onroot my.image -+xloadimage \-onroot my.image - .PP - To center an image on the default root background: - .sp - .ti +5 --xloadimage -default -tile my.image -+xloadimage \-default \-tile my.image - .sp - If using a monochrome display and a color image you will probably want - to dither the image for a cleaner (and faster) display: - .sp - .ti +5 --xloadimage -default -tile -dither my.image -+xloadimage \-default \-tile \-dither my.image - .PP - To load a monochrome image "my.image" onto the background, using red - as the foreground color, replicate the image, and overlay - "another.image" onto it at coordinate (10,10): - .sp - .ti +5 --xloadimage -foreground red my.image -at 10,10 another.image -+xloadimage \-foreground red my.image \-at 10,10 another.image - .PP - To center the rectangular region from 10 to 110 along the X axis and - from 10 to the height of the image along the Y axis: - .sp - .ti +5 --xloadimage -center -clip 10,10,100,0 my.image -+xloadimage \-center \-clip 10,10,100,0 my.image - .PP - To double the size of an image: - .sp - .ti +5 --xloadimage -zoom 200 my.image -+xloadimage \-zoom 200 my.image - .PP - To halve the size of an image: - .sp - .ti +5 --xloadimage -zoom 50 my.image -+xloadimage \-zoom 50 my.image - .PP - To brighten a dark image: - .sp - .ti +5 --xloadimage -brighten 150 my.image -+xloadimage \-brighten 150 my.image - .PP - To darken a bright image: - .sp - .ti +5 --xloadimage -brighten 50 my.image -+xloadimage \-brighten 50 my.image - .SH HINTS FOR GOOD IMAGE DISPLAYS - Since images are likely to come from a variety of sources, they may be - in a variety of aspect ratios which may not be supported by your --display. The \fI-xzoom\fR and \fI-yzoom\fR options can be used to -+display. The \fI\-xzoom\fR and \fI\-yzoom\fR options can be used to - change the aspect ratio of an image before display. If you use these - options, it is recommended that you increase the size of one of the - dimensions instead of shrinking the other, since shrinking looses - detail. For instance, many GIF and G3 FAX images have an X:Y ratio of - about 2:1. You can correct this for viewing on a 1:1 display with --either \fI-xzoom 50\fR or \fI-yzoom 200\fR (reduce X axis to 50% of -+either \fI\-xzoom 50\fR or \fI\-yzoom 200\fR (reduce X axis to 50% of - its size and expand Y axis to 200% of its size, respectively) but the - latter should be used so no detail is lost in the conversion. - .PP - When zooming color images up you can reduce blockiness with --\fI-smooth\fR. For zooms of 300% or more, I recommend two smoothing -+\fI\-smooth\fR. For zooms of 300% or more, I recommend two smoothing - passes (although this can take awhile to do on slow machines). There - will be a noticeable improvement in the image. - .PP - You can perform image processing on a small portion of an image by --loading the image more than once and using the \fI-merge\fR, \fI-at\fR --and \fI-clip\fR options. Load the image, then merge it with a -+loading the image more than once and using the \fI\-merge\fR, \fI\-at\fR -+and \fI\-clip\fR options. Load the image, then merge it with a - clipped, processed version of itself. To brighten a 100x100 rectangular - portion of an image located at (50,50), for instance, you could type: - .sp - .ti +5 --xloadimage my.image -merge -at 50,50 -clip 50,50,100,100 -brighten 150 my.image -+xloadimage my.image \-merge \-at 50,50 \-clip 50,50,100,100 \-brighten 150 my.image - .PP - If you're using a display with a small colormap to display colorful --images, try using the \fI-gray\fR option to convert to grayscale. -+images, try using the \fI\-gray\fR option to convert to grayscale. - .SH PATHS AND EXTENSIONS - The file ~/.xloadimagerc (and optionally a system-wide file) defines a - number of configuration options that affect xloadimage. -@@ -472,19 +472,19 @@ provided for compressed (.Z) files and G - \fBFILTERS\fR section for more information on defining your own - filters. - .PP --Any text on a line following a hash-mark (#) is ignored; if you wish --to use a hash-mark in a path, extension, or filter you can escape it -+Any text on a line following a hash\(hymark (#) is ignored; if you wish -+to use a hash\(hymark in a path, extension, or filter you can escape it - using a backslash (\\). - .PP - If you wish to include white-space in a filter program name, path, or --extension you can enclose the entire text in double-quotes. For -+extension you can enclose the entire text in double\(hyquotes. For - example: - .PP - .nf -- filter = "gzip -cd" .gz -+ filter = "gzip \-cd" .gz - .fi - .PP --Use backslash (\\) characters to allow inclusion of double-quote marks -+Use backslash (\\) characters to allow inclusion of double\(hyquote marks - or newlines. - .PP - The following is a sample ~/.xloadimagerc file: -@@ -499,7 +499,7 @@ The following is a sample ~/.xloadimager - extension = .csun .msun .sun .face .xbm .bm - - # invoke GNU zip if a .z or .zip extension is found -- filter = "gzip -cd" .z .zip -+ filter = "gzip \-cd" .z .zip - - .fi - .PP -@@ -507,7 +507,7 @@ The following is a sample ~/.xloadimager - .PP - \fIXloadimage\fR currently supports many common and some uncommon - image types, and can create images in several formats. For a complete --list use the \fI-supported\fR option. -+list use the \fI\-supported\fR option. - .SH DUMPING IMAGES - Several image dumpers are included that can be used to create a new - image after loading and processing. The NIFF (Native Image File -@@ -518,12 +518,12 @@ format. - Some image dumpers allow options that affect the image output. These - options are appended to the image type following a comma and are - separated by commas. If a value is desired it can be specified --following an equals-sign. For example, to create a monochrome JPEG -+following an equals\(hysign. For example, to create a monochrome JPEG - image file with a quality factor of 80, you would use the following - command line: - .PP - .nf -- xloadimage image_name -dump jpeg,quality=80,grayscale new_image.jpg -+ xloadimage image_name \-dump jpeg,quality=80,grayscale new_image.jpg - .fi - .PP - Option names can be abbreviated but if the abbreviation is too short -@@ -537,20 +537,20 @@ The xloadimage distribution includes a s - called \fIuufilter\fR that can be used to automatically uudecode files - for processing. \fIUufilter\fR ignores extraneous lines in the file - so it is particularly useful if the uuencoded file was created by --concatenating email or news postings that had headers or line-break -+concatenating email or news postings that had headers or line\(hybreak - indicators included. - .PP - To make use of \fIuufilter\fR you can add the following to your - \fI.xloadimagerc\fR file: - .PP - .nf -- filter = "uufilter -s" .uu .uue -+ filter = "uufilter \-s" .uu .uue - .fi - The filter will be automatically invoked on any file with a .uu or - \&.uue extension. - .PP - For a list of filters automatically recognized by xloadimage use the --\fI-configuration\fR option. -+\fI\-configuration\fR option. - .PP - .SH SUPPORTED IMAGE OPTIONS - .PP -@@ -564,7 +564,7 @@ Force a monochrome (grayscale) image to - image. - .TP - nointerleave --Create a non-interleaved file. -+Create a non\(hyinterleaved file. - .TP - optimize - Enable entropy parameter optimization. -@@ -604,9 +604,9 @@ Image data compression technique. Can b - \fIrle\fR (CCITT RLE compression), - \fIg3fax\fR (CCITT Group 3 FAX compression), - \fIg4fax\fR (CCITT Group 4 FAX compression), --\fIlzw\fR (Limpel-Ziv-Welsh compression, the default), -+\fIlzw\fR (Limpel\(hyZiv\(hyWelsh compression, the default), - \fIjpeg\fR (JPEG compression), --\fInext\fR (NeXT run-length compression), -+\fInext\fR (NeXT run\(hylength compression), - \fIrlew\fR (CCITT RLEW compression), - \fImac\fR (Macintosh PackBits compression), - \fIpackbits\fR (same as \fImac\fR), -@@ -624,17 +624,17 @@ CenterLine Software - jimf@centerline.com - .fi - .PP --For a more-or-less complete list of other contributors (there are a -+For a more\(hyor\(hyless complete list of other contributors (there are a - \fIlot\fR of them), please see the README file enclosed with the - distribution. - .SH FILES - .nf - .in +5 --xloadimage - the image loader and viewer --xsetbg - pseudonym which quietly sets the background --xview - pseudonym which views in a window --/etc/X11/Xloadimage - default system-wide configuration file --~/.xloadimagerc - user's personal configuration file -+xloadimage \- the image loader and viewer -+xsetbg \- pseudonym which quietly sets the background -+xview \- pseudonym which views in a window -+/etc/X11/Xloadimage \- default system-wide configuration file -+~/.xloadimagerc \- user's personal configuration file - .in -5 - .fi - .SH COPYRIGHT -@@ -662,7 +662,7 @@ file, but \fIxloadimage\fR will only dis - Only GIF87a format is supported. - .PP - One of the pseudonyms for \fIxloadimage\fR, \fIxview\fR, is the same --name as Sun uses for their SunView-under-X package. This will be -+name as Sun uses for their SunView\(hyunder\(hyX package. This will be - confusing if you're one of those poor souls who has to use Sun's - XView. - .PP -@@ -674,7 +674,7 @@ screen, something which is normally avoi - also ignore the MaxSize argument's real function, to limit the maximum - size of the window, and allow the window to be resized larger than the - image. If this happens, \fIxloadimage\fR merely places the image in --the upper-left corner of the window and uses the zero-value'ed pixel -+the upper\(hyleft corner of the window and uses the zero\(hyvalue'ed pixel - for any space which is not covered by the image. This behavior is --less-than-graceful but so are window managers which are cruel enough -+less\(hythan\(hygraceful but so are window managers which are cruel enough - to ignore such details. diff --git a/32_fix-spelling.patch b/32_fix-spelling.patch deleted file mode 100644 index 17b4f57..0000000 --- a/32_fix-spelling.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Fix spelling issues in upstream source -Author: Dominik George ---- a/compress.c -+++ b/compress.c -@@ -145,7 +145,7 @@ void compress_cmap(image, verbose) - } - if (verbose) { - if ((rgb.used == image->rgb.used) && !badcount) -- printf("no improvment\n"); -+ printf("no improvement\n"); - else { - int unused= image->rgb.used - rgb.used - dupcount; - if (dupcount) ---- a/options.c -+++ b/options.c -@@ -707,7 +707,7 @@ void processOptions(argc, argv, rglobal, - break; - - case IDELAY: -- fprintf(stderr, "%s has been superceded by %s (translating)\n", -+ fprintf(stderr, "%s has been superseded by %s (translating)\n", - optionName(IDELAY), optionName(DELAY)); - /* FALLTHRU */ - diff --git a/xloadimage-4.1-bracketfix.patch b/xloadimage-4.1-bracketfix.patch deleted file mode 100644 index fc2b314..0000000 --- a/xloadimage-4.1-bracketfix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xloadimage.4.1/jpeg.c.bracketfix xloadimage.4.1/jpeg.c ---- xloadimage.4.1/jpeg.c.bracketfix 2011-06-28 16:54:25.097451047 -0400 -+++ xloadimage.4.1/jpeg.c 2011-06-28 16:54:32.707354456 -0400 -@@ -319,6 +319,7 @@ static void parseOptions(j_compress_ptr - if (verbose) - printf(" Using arithmetic coding.\n"); - cinfo->arith_code = TRUE; -+ } - #else - fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); - } diff --git a/xloadimage-4.1-c23.patch b/xloadimage-4.1-c23.patch deleted file mode 100644 index d9699c9..0000000 --- a/xloadimage-4.1-c23.patch +++ /dev/null @@ -1,3739 +0,0 @@ -diff -up xloadimage.4.1/bright.c.c23 xloadimage.4.1/bright.c ---- xloadimage.4.1/bright.c.c23 2025-02-24 15:41:17.644552724 -0500 -+++ xloadimage.4.1/bright.c 2025-02-24 15:41:17.686319694 -0500 -@@ -15,10 +15,7 @@ - /* alter an image's brightness by a given percentage - */ - --void brighten(image, percent, verbose) -- Image *image; -- unsigned int percent; -- unsigned int verbose; -+void brighten(Image *image, unsigned int percent, unsigned int verbose) - { int a; - unsigned int newrgb; - float fperc; -@@ -69,10 +66,7 @@ void brighten(image, percent, verbose) - printf("done\n"); - } - --void gammacorrect(image, disp_gam, verbose) -- Image *image; -- double disp_gam; -- unsigned int verbose; -+void gammacorrect(Image *image, double disp_gam, unsigned int verbose) - { int a; - static int gammamap[256]; - byte *destptr; -@@ -119,10 +113,7 @@ void gammacorrect(image, disp_gam, verbo - /* this initializes a lookup table for doing normalization - */ - --static void setupNormalizationArray(min, max, array, verbose) -- unsigned int min, max; -- byte *array; -- unsigned int verbose; -+static void setupNormalizationArray(unsigned int min, unsigned int max, byte *array, unsigned int verbose) - { int a; - unsigned int new; - float factor; -@@ -141,9 +132,7 @@ static void setupNormalizationArray(min, - /* normalize an image. - */ - --Image *normalize(image, verbose) -- Image *image; -- unsigned int verbose; -+Image *normalize(Image *image, unsigned int verbose) - { unsigned int a, x, y; - unsigned int min, max; - Pixel pixval; -@@ -251,9 +240,7 @@ Image *normalize(image, verbose) - /* convert to grayscale - */ - --void gray(image, verbose) -- Image *image; -- unsigned int verbose; -+void gray(Image *image, unsigned int verbose) - { int a; - unsigned int size; - Intensity intensity, red, green, blue; -diff -up xloadimage.4.1/clip.c.c23 xloadimage.4.1/clip.c ---- xloadimage.4.1/clip.c.c23 1993-10-21 17:28:36.000000000 -0400 -+++ xloadimage.4.1/clip.c 2025-02-24 15:41:17.686493983 -0500 -@@ -11,10 +11,7 @@ - #include "copyright.h" - #include "image.h" - --Image *clip(simage, clipx, clipy, clipw, cliph, verbose) -- Image *simage; -- unsigned int clipx, clipy, clipw, cliph; -- unsigned int verbose; -+Image *clip(Image *simage, unsigned int clipx, unsigned int clipy, unsigned int clipw, unsigned int cliph, unsigned int verbose) - { Image *image; - unsigned int x, y; - unsigned int slinelen, dlinelen; -diff -up xloadimage.4.1/cmuwmraster.c.c23 xloadimage.4.1/cmuwmraster.c ---- xloadimage.4.1/cmuwmraster.c.c23 2025-02-24 15:41:17.644796059 -0500 -+++ xloadimage.4.1/cmuwmraster.c 2025-02-24 15:41:17.686602182 -0500 -@@ -16,9 +16,7 @@ - - /* SUPPRESS 558 */ - --void babble(name, headerp) --char *name; --struct cmuwm_header *headerp; -+void babble(char *name, struct cmuwm_header *headerp) - { - printf("%s is a %ldx%ld %ld plane CMU WM raster\n", - name, -@@ -27,8 +25,7 @@ struct cmuwm_header *headerp; - memToVal(headerp->depth, sizeof(short))); - } - --int cmuwmIdent(fullname, name) --char *fullname, *name; -+int cmuwmIdent(char *fullname, char *name) - { - ZFILE *zf; - struct cmuwm_header header; -@@ -67,9 +64,7 @@ char *fullname, *name; - return r; - } - --Image* cmuwmLoad(fullname, name, verbose) --char *fullname, *name; --unsigned int verbose; -+Image* cmuwmLoad(char *fullname, char *name, unsigned int verbose) - { - ZFILE *zf; - struct cmuwm_header header; -diff -up xloadimage.4.1/compress.c.c23 xloadimage.4.1/compress.c ---- xloadimage.4.1/compress.c.c23 2025-02-24 15:41:17.684853621 -0500 -+++ xloadimage.4.1/compress.c 2025-02-24 15:41:17.686677322 -0500 -@@ -30,9 +30,7 @@ - - #define NIL_PIXEL 0xffffffff - --void compress_cmap(image, verbose) -- Image *image; -- unsigned int verbose; -+void compress_cmap(Image *image, unsigned int verbose) - { Pixel hash_table[32768]; - Pixel *pixel_table; - Pixel *pixel_map; -diff -up xloadimage.4.1/config.c.c23 xloadimage.4.1/config.c ---- xloadimage.4.1/config.c.c23 2025-02-24 15:41:17.659819318 -0500 -+++ xloadimage.4.1/config.c 2025-02-24 15:41:17.686756047 -0500 -@@ -36,8 +36,7 @@ static char *PathToken= "path"; - static char *ExtToken= "extension"; - static char *FilterToken= "filter"; - --static void addFilter(extension, filter) -- char *extension, *filter; -+static void addFilter(char *extension, char *filter) - { struct filter *f, *t; - - f= (struct filter *)lmalloc(sizeof(struct filter)); -@@ -66,9 +65,7 @@ enum parse_state { - /* this function eats up whitespace, incrementing the line number at - * each newline - */ --static void skip_whitespace(f, linenum) -- FILE *f; -- unsigned int *linenum; -+static void skip_whitespace(FILE *f, unsigned int *linenum) - { - int c; - -@@ -92,8 +89,7 @@ static void skip_whitespace(f, linenum) - } - - --static void readPathsAndExts(name) -- char *name; -+static void readPathsAndExts(char *name) - { FILE *f; - char buf[BUFSIZ]; - char filter_name[BUFSIZ]; -@@ -298,9 +294,7 @@ void loadPathsAndExts() - #endif - } - --static int fileIsOk(fullname, sbuf) -- char *fullname; -- struct stat *sbuf; -+static int fileIsOk(char *fullname, struct stat *sbuf) - { - if ((sbuf->st_mode & S_IFMT) == S_IFDIR) /* is a directory */ - return(0); -@@ -311,8 +305,7 @@ static int fileIsOk(fullname, sbuf) - * -1 if access denied or not found, 0 if ok. - */ - --int findImage(name, fullname) -- char *name, *fullname; -+int findImage(char *name, char *fullname) - { unsigned int p, e; - struct stat sbuf; - -@@ -451,8 +444,7 @@ static char *homedir() - return pw->pw_dir; - } - --char *expandPath(p) -- char *p; -+char *expandPath(char *p) - { char buf1[BUFSIZ], buf2[BUFSIZ]; - int b1, b2, var; - char *ptr; -diff -up xloadimage.4.1/dither.c.c23 xloadimage.4.1/dither.c ---- xloadimage.4.1/dither.c.c23 1993-10-22 11:22:55.000000000 -0400 -+++ xloadimage.4.1/dither.c 2025-02-24 15:41:17.686829679 -0500 -@@ -28,17 +28,15 @@ - #define Threshold 16384 /* in the dithering process */ - #define MinGrey 0 - --static unsigned int tone_scale_adjust(); --static void LeftToRight(); --static void RightToLeft(); -+static unsigned int tone_scale_adjust(unsigned int); -+static void LeftToRight(int *, int *, int); -+static void RightToLeft(int *, int *, int); - - /* - * simple floyd-steinberg dither with serpentine raster processing - */ - --Image *dither(cimage, verbose) -- Image *cimage; -- unsigned int verbose; -+Image *dither(Image *cimage, unsigned int verbose) - { - Image *image; /* destination image */ - unsigned int *grey; /* grey map for source image */ -@@ -189,8 +187,7 @@ Image *dither(cimage, verbose) - * - * this should help things look a bit better on most displays. - */ --static unsigned int tone_scale_adjust(val) -- unsigned int val; -+static unsigned int tone_scale_adjust(unsigned int val) - { - unsigned int rslt; - -@@ -207,10 +204,7 @@ static unsigned int tone_scale_adjust(va - /* - * dither a line from left to right - */ --static void LeftToRight(curr, next, width) -- int *curr; -- int *next; -- int width; -+static void LeftToRight(int *curr, int *next, int width) - { - int idx; - int error; -@@ -232,10 +226,7 @@ static void LeftToRight(curr, next, widt - /* - * dither a line from right to left - */ --static void RightToLeft(curr, next, width) -- int *curr; -- int *next; -- int width; -+static void RightToLeft(int *curr, int *next, int width) - { - int idx; - int error; -diff -up xloadimage.4.1/faces.c.c23 xloadimage.4.1/faces.c ---- xloadimage.4.1/faces.c.c23 2025-02-24 15:41:17.678137737 -0500 -+++ xloadimage.4.1/faces.c 2025-02-24 15:41:17.686901561 -0500 -@@ -55,9 +55,7 @@ static void initHexTable() - /* read a hex value and return its value - */ - --static int nextInt(zf, len) -- ZFILE *zf; -- unsigned int len; -+static int nextInt(ZFILE *zf, unsigned int len) - { int c; - int value= 0; - int count; -@@ -83,9 +81,7 @@ static int nextInt(zf, len) - return(value); - } - --Image *facesLoad(fullname, name, verbose) -- char *fullname, *name; -- int verbose; -+Image *facesLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - Image *image; - char fname[BUFSIZ]; -@@ -175,8 +171,7 @@ Image *facesLoad(fullname, name, verbose - return(image); - } - --int facesIdent(fullname, name) -- char *fullname, *name; -+int facesIdent(char *fullname, char *name) - { Image *image; - - if ((image= facesLoad(fullname, name, 1))) { -diff -up xloadimage.4.1/fbm.c.c23 xloadimage.4.1/fbm.c ---- xloadimage.4.1/fbm.c.c23 2025-02-24 15:41:17.645345316 -0500 -+++ xloadimage.4.1/fbm.c 2025-02-24 15:41:17.686962764 -0500 -@@ -104,8 +104,7 @@ static int fbmin_image_test() - * open FBM image in the input stream; returns FBMIN_SUCCESS if - * successful. (might also return various FBMIN_ERR codes.) - */ --static int fbmin_open_image(s) --ZFILE *s; -+static int fbmin_open_image(ZFILE *s) - { - char *hp; /* header pointer */ - -@@ -167,8 +166,7 @@ static int fbmin_close_file() - * semi-graceful fatal error mechanism - */ - --static fbmin_fatal(msg) -- char *msg; -+static fbmin_fatal(char *msg) - { - printf("Error reading FBM file: %s\n", msg); - exit(0); -@@ -184,8 +182,7 @@ static fbmin_fatal(msg) - * descriptive but I don't care - */ - --static void tellAboutImage(name) -- char *name; -+static void tellAboutImage(char *name) - { - if (fbmin_img_clrlen > 0) - printf("%s is a %dx%d FBM image with %d colors\n", name, -@@ -195,9 +192,7 @@ static void tellAboutImage(name) - name, fbmin_img_width, fbmin_img_height, fbmin_img_bits); - } - --Image *fbmLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *fbmLoad(char *fullname, char *name, unsigned int verbose) - { - ZFILE *zf; - Image *image; -@@ -288,8 +283,7 @@ Image *fbmLoad(fullname, name, verbose) - return(image); - } - --int fbmIdent(fullname, name) --char *fullname, *name; -+int fbmIdent(char *fullname, char *name) - { - ZFILE *zf; - unsigned int ret; -diff -up xloadimage.4.1/fill.c.c23 xloadimage.4.1/fill.c ---- xloadimage.4.1/fill.c.c23 1993-10-21 17:28:37.000000000 -0400 -+++ xloadimage.4.1/fill.c 2025-02-24 15:41:17.687027255 -0500 -@@ -11,10 +11,7 @@ - #include "copyright.h" - #include "image.h" - --void fill(image, fx, fy, fw, fh, pixval) -- Image *image; -- unsigned int fx, fy, fw, fh; -- Pixel pixval; -+void fill(Image *image, unsigned int fx, unsigned int fy, unsigned int fw, unsigned int fh, Pixel pixval) - { unsigned int x, y; - unsigned int linelen, start; - byte *lineptr, *pixptr; -diff -up xloadimage.4.1/gif.c.c23 xloadimage.4.1/gif.c ---- xloadimage.4.1/gif.c.c23 2025-02-24 15:41:17.645515975 -0500 -+++ xloadimage.4.1/gif.c 2025-02-24 15:41:17.687105301 -0500 -@@ -105,8 +105,7 @@ static BYTE gifin_interlace_flag; / - * open a GIF file, using s as the input stream - */ - --static int gifin_open_file(s) -- ZFILE *s; -+static int gifin_open_file(ZFILE *s) - { - /* make sure there isn't already a file open */ - if (file_open) -@@ -255,8 +254,7 @@ static int gifin_open_image() - * try to read next pixel from the raster, return result in *pel - */ - --static int gifin_get_pixel(pel) -- int *pel; -+static int gifin_get_pixel(int *pel) - { - int code; - int first; -@@ -381,9 +379,7 @@ static int gifin_close_file() - * load a colormap from the input stream - */ - --static int gifin_load_cmap(cmap, ncolors) -- BYTE cmap[3][256]; -- int ncolors; -+static int gifin_load_cmap(BYTE cmap[3][256], int ncolors) - { - int i; - -@@ -447,8 +443,7 @@ static int gifin_read_data_block() - * (returns the code of the first pixel in the string) - */ - --static int gifin_push_string(code) -- int code; -+static int gifin_push_string(int code) - { - int rslt; - -@@ -468,9 +463,7 @@ static int gifin_push_string(code) - * add a new string to the string table - */ - --static void gifin_add_string(p, e) -- int p; -- int e; -+static void gifin_add_string(int p, int e) - { - prefix[table_size] = p; - extnsn[table_size] = e; -@@ -488,8 +481,7 @@ static void gifin_add_string(p, e) - * semi-graceful fatal error mechanism - */ - --static void gifin_fatal(msg) -- char *msg; -+static void gifin_fatal(char *msg) - { - printf("Error reading GIF file: %s\n", msg); - exit(0); -@@ -502,8 +494,7 @@ static void gifin_fatal(msg) - * descriptive but I don't care - */ - --static void tellAboutImage(name) -- char *name; -+static void tellAboutImage(char *name) - { - printf("%s is a %dx%d %sGIF image with %d colors\n", name, - gifin_img_width, gifin_img_height, -@@ -511,9 +502,7 @@ static void tellAboutImage(name) - (gifin_l_cmap_flag ? gifin_l_ncolors : gifin_g_ncolors)); - } - --Image *gifLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *gifLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - Image *image; - int x, y, pixel, pass, scanlen; -@@ -605,8 +594,7 @@ Image *gifLoad(fullname, name, verbose) - return(image); - } - --int gifIdent(fullname, name) -- char *fullname, *name; -+int gifIdent(char *fullname, char *name) - { ZFILE *zf; - unsigned int ret; - -diff -up xloadimage.4.1/gif.h.c23 xloadimage.4.1/gif.h ---- xloadimage.4.1/gif.h.c23 2025-02-24 15:41:17.645819159 -0500 -+++ xloadimage.4.1/gif.h 2025-02-24 15:41:17.687187024 -0500 -@@ -39,19 +39,19 @@ - - typedef unsigned char BYTE; - --static int gifin_open_file(); -+static int gifin_open_file(ZFILE *s); - static int gifin_open_image(); --static int gifin_get_pixel(); -+static int gifin_get_pixel(int *pel); - #if 0 - static int gifin_close_image(); - #endif - static int gifin_close_file(); --static int gifin_load_cmap(); -+static int gifin_load_cmap(BYTE cmap[3][256], int ncolors); - static int gifin_skip_extension(); - static int gifin_read_data_block(); --static int gifin_push_string(); --static void gifin_add_string(); --static void gifin_fatal(); -+static int gifin_push_string(int code); -+static void gifin_add_string(int p, int e); -+static void gifin_fatal(char *msg); - - /* #defines, typedefs, and such - */ -diff -up xloadimage.4.1/halftone.c.c23 xloadimage.4.1/halftone.c ---- xloadimage.4.1/halftone.c.c23 2025-02-24 15:41:17.645925059 -0500 -+++ xloadimage.4.1/halftone.c 2025-02-24 15:41:17.687245717 -0500 -@@ -152,9 +152,7 @@ static byte DitherBits[GRAYS][4] = { - /* simple dithering algorithm, really optimized for the 4x4 array - */ - --Image *halftone(cimage, verbose) -- Image *cimage; -- unsigned int verbose; -+Image *halftone(Image *cimage, unsigned int verbose) - { Image *image; - unsigned char *sp, *dp, *dp2; /* data pointers */ - unsigned int dindex; /* index into dither array */ -diff -up xloadimage.4.1/image.h.c23 xloadimage.4.1/image.h ---- xloadimage.4.1/image.h.c23 2025-02-24 15:41:17.646185272 -0500 -+++ xloadimage.4.1/image.h 2025-02-24 15:41:17.687306239 -0500 -@@ -248,12 +248,12 @@ Image *tile _ArgProto((Image *image, int - void memoryExhausted _ArgProto((void)); - char *tail _ArgProto((char *)); - void usage _ArgProto((void)); --int errorHandler(); -+/* int errorHandler(Display *, XErrorEvent *); */ - char *findstr _ArgProto((char *, char *)); - - /* new.c */ - extern unsigned long DepthToColorsTable[]; --unsigned long colorsToDepth(); -+unsigned long colorsToDepth(unsigned long); - char *dupString _ArgProto((char *s)); - Image *newBitImage _ArgProto((unsigned int width, unsigned int height)); - Image *newRGBImage _ArgProto((unsigned int width, unsigned int height, -diff -up xloadimage.4.1/imagetypes.c.c23 xloadimage.4.1/imagetypes.c ---- xloadimage.4.1/imagetypes.c.c23 2025-02-24 15:41:17.660062713 -0500 -+++ xloadimage.4.1/imagetypes.c 2025-02-24 15:41:17.687371592 -0500 -@@ -21,11 +21,7 @@ extern int findImage(char *name, char *f - /* load a named image - */ - --Image *loadImage(globalopts, options, name, verbose) -- OptionSet *globalopts; -- OptionSet *options; -- char *name; -- unsigned int verbose; -+Image *loadImage(OptionSet *globalopts, OptionSet *options, char *name, unsigned int verbose) - { char fullname[BUFSIZ]; - Option *opt; - Image *image; -@@ -103,8 +99,7 @@ Image *loadImage(globalopts, options, na - /* identify what kind of image a named image is - */ - --void identifyImage(name) -- char *name; -+void identifyImage(char *name) - { char fullname[BUFSIZ]; - int a; - -@@ -127,11 +122,7 @@ void identifyImage(name) - - /* dump an image into an image file of the specified type - */ --void dumpImage(image, type, filename, verbose) -- Image *image; -- char *type; -- char *filename; -- int verbose; -+void dumpImage(Image *image, char *type, char *filename, int verbose) - { int a; - char typename[32]; - char *optptr; -diff -up xloadimage.4.1/imagetypes.h.c23 xloadimage.4.1/imagetypes.h ---- xloadimage.4.1/imagetypes.h.c23 2025-02-24 15:41:17.646580011 -0500 -+++ xloadimage.4.1/imagetypes.h 2025-02-24 15:41:17.687441295 -0500 -@@ -10,84 +10,84 @@ - #ifndef __IMAGETYPES_H__ - #define __IMAGETYPES_H__ - --Image *niffLoad(); --Image *facesLoad(); --Image *pbmLoad(); --Image *sunRasterLoad(); --Image *gifLoad(); --Image *rleLoad(); --Image *xwdLoad(); --Image *vffLoad(); --Image *xbitmapLoad(); --Image *xpixmapLoad(); --Image *fbmLoad(); --Image *pcxLoad(); --Image *imgLoad(); --Image *macLoad(); --Image *cmuwmLoad(); --Image *mcidasLoad(); -+Image *niffLoad(char *, char *, unsigned int); -+Image *facesLoad(char *, char *, unsigned int); -+Image *pbmLoad(char *, char *, unsigned int); -+Image *sunRasterLoad(char *, char *, unsigned int); -+Image *gifLoad(char *, char *, unsigned int); -+Image *rleLoad(char *, char *, unsigned int); -+Image *xwdLoad(char *, char *, unsigned int); -+Image *vffLoad(char *, char *, unsigned int); -+Image *xbitmapLoad(char *, char *, unsigned int); -+Image *xpixmapLoad(char *, char *, unsigned int); -+Image *fbmLoad(char *, char *, unsigned int); -+Image *pcxLoad(char *, char *, unsigned int); -+Image *imgLoad(char *, char *, unsigned int); -+Image *macLoad(char *, char *, unsigned int); -+Image *cmuwmLoad(char *, char *, unsigned int); -+Image *mcidasLoad(char *, char *, unsigned int); - #if 0 - Image *pdsLoad(); - #else --Image *vicarLoad(); -+Image *vicarLoad(char *, char *, unsigned int); - #endif - #ifdef HAVE_LIBJPEG --Image *jpegLoad(); -+Image *jpegLoad(char *, char *, unsigned int); - #endif - #ifdef HAVE_LIBTIFF --Image *tiffLoad(); -+Image *tiffLoad(char *, char *, unsigned int); - #endif - #ifdef HAVE_LIBPNG --Image *pngLoad(); -+Image *pngLoad(char *, char *, unsigned int); - #endif - --int niffIdent(); --int facesIdent(); --int pbmIdent(); --int sunRasterIdent(); --int gifIdent(); --int rleIdent(); --int xwdIdent(); --int vffIdent(); --int xbitmapIdent(); --int xpixmapIdent(); --int fbmIdent(); --int pcxIdent(); --int imgIdent(); --int macIdent(); --int cmuwmIdent(); --int mcidasIdent(); -+int niffIdent(char *, char *); -+int facesIdent(char *, char *); -+int pbmIdent(char *, char *); -+int sunRasterIdent(char *, char *); -+int gifIdent(char *, char *); -+int rleIdent(char *, char *); -+int xwdIdent(char *, char *); -+int vffIdent(char *, char *); -+int xbitmapIdent(char *, char *); -+int xpixmapIdent(char *, char *); -+int fbmIdent(char *, char *); -+int pcxIdent(char *, char *); -+int imgIdent(char *, char *); -+int macIdent(char *, char *); -+int cmuwmIdent(char *, char *); -+int mcidasIdent(char *, char *); - #if 0 - int pdsIdent(); - #else --int vicarIdent(); -+int vicarIdent(char *, char *); - #endif - #ifdef HAVE_LIBJPEG --int jpegIdent(); -+int jpegIdent(char *, char *); - #endif - #ifdef HAVE_LIBTIFF --int tiffIdent(); -+int tiffIdent(char *, char *); - #endif - #ifdef HAVE_LIBPNG --int pngIdent(); -+int pngIdent(char *, char *); - #endif - --void niffDump(); -+void niffDump(Image *, char *, char *, int); - #ifdef HAVE_LIBJPEG --void jpegDump(); -+void jpegDump(Image *, char *, char *, int); - #endif - #ifdef HAVE_LIBTIFF --void tiffDump(); -+void tiffDump(Image *, char *, char *, int); - #endif --void pbmDump(); -+void pbmDump(Image *, char *, char *, int); - - /* some of these are order-dependent - */ - - struct { -- int (*identifier)(); /* print out image info if this kind of image */ -- Image *(*loader)(); /* load image if this kind of image */ -- void (*dumper)(); /* dump image of this kind */ -+ int (*identifier)(char fullname[BUFSIZ], char *name); /* print out image info if this kind of image */ -+ Image *(*loader)(char fullname[BUFSIZ], char *name, unsigned int verbose); /* load image if this kind of image */ -+ void (*dumper)(Image *image, char *optptr, char *filename, int verbose); /* dump image of this kind */ - char *type; /* image type name */ - char *name; /* name of this image format */ - } ImageTypes[] = { -diff -up xloadimage.4.1/img.c.c23 xloadimage.4.1/img.c ---- xloadimage.4.1/img.c.c23 2025-02-24 15:41:17.660268504 -0500 -+++ xloadimage.4.1/img.c 2025-02-24 15:41:17.687545005 -0500 -@@ -67,25 +67,25 @@ typedef struct ximg_header - byte color_model[2]; /* 0 = RGB,1 = CYM,2 = HLS, etc. */ - } XIMG_HEADER; - --void (*transf) (); -+void (*transf) (unsigned char *, unsigned int, unsigned char, unsigned int); - --static int vdi2pli(); -+static int vdi2pli(int, int); - #ifdef UNUSED_FUNCTIONS --static int pli2vdi(); -+static int pli2vdi(int, int); - #endif /* UNUSED_FUNCTIONS */ - --static void transf0 (); --static void transf1 (); -+static void transf0 (unsigned char *, unsigned int, unsigned char, unsigned int); -+static void transf1 (unsigned char *, unsigned int, unsigned char, unsigned int); - #ifdef UNUSED_FUNCTIONS --static void transf2 (); -+static void transf2 (unsigned char *, unsigned int, unsigned char, unsigned int); - #endif /* UNUSED_FUNCTIONS */ --static void transf3 (); --static void xread_img (); --static void xread_line (); --static int ident_img (); --static Image *load_img (); --static int ident_ximg (); --static Image *load_ximg (); -+static void transf3 (unsigned char *, unsigned int, unsigned char, unsigned int); -+static void xread_img (ZFILE *, unsigned int, int); -+static void xread_line (ZFILE *, int); -+static int ident_img (char *); -+static Image *load_img (char *); -+static int ident_ximg (char *); -+static Image *load_ximg (char *); - - IMGHEADER header; - XIMG_HEADER xheader; -@@ -97,11 +97,7 @@ static unsigned char *bitplane[ALL_PL - #endif /* UNUSED_FUNCTIONS */ - - --static void transf0(bitimage, plane, value, planes) -- unsigned char *bitimage; -- unsigned int plane; -- unsigned char value; -- unsigned int planes; -+static void transf0(unsigned char *bitimage, unsigned int plane, unsigned char value, unsigned int planes) - { - bitimage[x] = value; - x++; -@@ -109,11 +105,7 @@ static void transf0(bitimage, plane, val - - - --static void transf1(bitimage, plane, value, planes) -- unsigned char *bitimage; -- unsigned int plane; -- unsigned char value; -- unsigned int planes; -+static void transf1(unsigned char *bitimage, unsigned int plane, unsigned char value, unsigned int planes) - { - unsigned char bit; - unsigned long off; -@@ -133,11 +125,7 @@ static void transf1(bitimage, plane, val - - - #ifdef UNUSED_FUNCTIONS --static void transf2(bitimage, plane, value, planes) -- unsigned char *bitimage; -- unsigned int plane; -- unsigned char value; -- unsigned int planes; -+static void transf2(unsigned char *bitimage, unsigned int plane, unsigned char value, unsigned int planes) - { - int i; - -@@ -152,11 +140,7 @@ static void transf2(bitimage, plane, val - } - #endif /* UNUSED_FUNCTIONS */ - --static void transf3(bitimage, plane, value, planes) -- unsigned char *bitimage; -- unsigned int plane; -- unsigned char value; -- unsigned int planes; -+static void transf3(unsigned char *bitimage, unsigned int plane, unsigned char value, unsigned int planes) - { - unsigned char bit; - unsigned long off; -@@ -181,9 +165,7 @@ static void transf3(bitimage, plane, val - x++; - } - --static void xread_line (file, planes) --ZFILE *file; --int planes; -+static void xread_line (ZFILE *file, int planes) - { - ByteNr= 0; - for (plane= 0; plane < planes; plane++) -@@ -198,10 +180,7 @@ int planes; - - - --static void xread_img (file, linie, planes) --ZFILE *file; --unsigned int linie; --int planes; -+static void xread_img (ZFILE *file, unsigned int linie, int planes) - { - unsigned int wert, i, k; - unsigned char status; -@@ -366,8 +345,7 @@ int planes; - } - } - --static int ident_img(name) -- char *name; -+static int ident_img(char *name) - { - ZFILE *file; - long size = 0; -@@ -415,8 +393,7 @@ static int ident_img(name) - return (1); - } - --static Image *load_img(name) -- char *name; -+static Image *load_img(char *name) - { - ZFILE *file; - Image *image = NULL; -@@ -564,8 +541,7 @@ static Image *load_img(name) - - - --static int ident_ximg(name) -- char *name; -+static int ident_ximg(char *name) - { - ZFILE *file; - long size = 0; -@@ -604,8 +580,7 @@ static int ident_ximg(name) - return (1); - } - --static int vdi2pli(vdi, plimax) -- int vdi, plimax; -+static int vdi2pli(int vdi, int plimax) - { - static char vdi2pli[] = {0, 15, 1, 2, 4, 6, 3, 5, 7, 8, 9, 10, 12, 14, 11, 13 }; - -@@ -618,8 +593,7 @@ static int vdi2pli(vdi, plimax) - - - #ifdef UNUSED_FUNCTIONS --static int pli2vdi(pli, plimax) -- int pli, plimax; -+static int pli2vdi(int pli, int plimax) - { - static char pli2vdi[] = {0, 2, 3, 6, 4, 7, 5, 8, 9, 10, 11, 14, 12, 15, 13, 1 }; - -@@ -631,8 +605,7 @@ static int pli2vdi(pli, plimax) - } - #endif /* UNUSED_FUNCTIONS */ - --static Image *load_ximg(name) -- char *name; -+static Image *load_ximg(char *name) - { - void transferRGBMap(); - ZFILE *file; -@@ -757,10 +730,7 @@ static Image *load_ximg(name) - return(image); - } - --int imgIdent(name, name2, verbose) -- char *name; -- char *name2; -- int verbose; -+int imgIdent(char *name, char *name2) - { - int identified; - -@@ -771,10 +741,7 @@ int imgIdent(name, name2, verbose) - return(identified); - } - --Image *imgLoad(name, name2, verbose) -- char *name; -- char *name2; -- int verbose; -+Image *imgLoad(char *name, char *name2, unsigned int verbose) - { - errorInLoad = 0; - out_depthError = 0; -diff -up xloadimage.4.1/jpeg.c.c23 xloadimage.4.1/jpeg.c ---- xloadimage.4.1/jpeg.c.c23 2025-02-24 15:41:17.669166007 -0500 -+++ xloadimage.4.1/jpeg.c 2025-02-24 15:41:17.687638571 -0500 -@@ -114,8 +114,7 @@ static void error_exit (j_common_ptr com - - - static void --jpegInfo (cinfo) -- j_decompress_ptr cinfo; -+jpegInfo (j_decompress_ptr cinfo) - { - /* Create display of image parameters */ - printf("%s is a %dx%d JPEG image, color space ", filename, -@@ -155,9 +154,7 @@ jpegInfo (cinfo) - /* Main control routine for loading */ - - Image * --jpegLoad (fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+jpegLoad (char *fullname, char *name, unsigned int verbose) - { - struct jpeg_decompress_struct cinfo; - struct jpeg_source_mgr src_mgr; -@@ -248,8 +245,7 @@ jpegLoad (fullname, name, verbose) - return 0: Not jpeg file. - */ - int --jpegIdent (fullname, name) -- char *fullname, *name; -+jpegIdent (char *fullname, char *name) - { - struct jpeg_decompress_struct cinfo; - struct jpeg_source_mgr src_mgr; -diff -up xloadimage.4.1/mac.c.c23 xloadimage.4.1/mac.c ---- xloadimage.4.1/mac.c.c23 1993-10-21 17:28:39.000000000 -0400 -+++ xloadimage.4.1/mac.c 2025-02-24 15:41:17.687714255 -0500 -@@ -52,8 +52,7 @@ static int macin_img_BPL; /* ima - * successful. (might also return various MACIN_ERR codes.) - */ - /* ARGSUSED */ --static int macin_open_image(s) --ZFILE *s; -+static int macin_open_image(ZFILE *s) - { - BYTE mhdr[MAC_HDR_LEN]; - char *hp; /* header pointer */ -@@ -124,8 +123,7 @@ static int macin_close_file() - * semi-graceful fatal error mechanism - */ - --static macin_fatal(msg) -- char *msg; -+static macin_fatal(char *msg) - { - printf("Error reading MacPaint file: %s\n", msg); - exit(0); -@@ -141,16 +139,13 @@ static macin_fatal(msg) - * descriptive but I don't care - */ - --static void tellAboutImage(name) --char *name; -+static void tellAboutImage(char *name) - { - printf("%s is a %dx%d MacPaint image\n", - name, macin_img_width, macin_img_height); - } - --Image *macLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *macLoad(char *fullname, char *name, unsigned int verbose) - { - ZFILE *zf; - Image *image; -@@ -215,8 +210,7 @@ Image *macLoad(fullname, name, verbose) - return(image); - } - --int macIdent(fullname, name) --char *fullname, *name; -+int macIdent(char *fullname, char *name) - { - ZFILE *zf; - unsigned int ret; -diff -up xloadimage.4.1/mac.h.c23 xloadimage.4.1/mac.h ---- xloadimage.4.1/mac.h.c23 1993-10-21 17:28:39.000000000 -0400 -+++ xloadimage.4.1/mac.h 2025-02-24 15:41:17.687770362 -0500 -@@ -32,7 +32,7 @@ typedef unsigned char BYTE; /* 8 bits un - #define MACIN_ERR_NFO -7 /* no file open */ - #define MACIN_ERR_NIO -8 /* no image open */ - --static int macin_open_image(); -+static int macin_open_image(ZFILE *); - static int macin_close_file(); - #if 0 - static int macin_fatal(); -diff -up xloadimage.4.1/mcidas.c.c23 xloadimage.4.1/mcidas.c ---- xloadimage.4.1/mcidas.c.c23 2025-02-24 15:41:17.663801470 -0500 -+++ xloadimage.4.1/mcidas.c 2025-02-24 15:41:17.687880624 -0500 -@@ -7,7 +7,7 @@ - #include "xloadimage.h" - #include "mcidas.h" - --char *mc_sensor(); -+char *mc_sensor(int); - - static struct { - int days; -@@ -30,8 +30,7 @@ static struct { - - /* convert numeric dates to human-readable - */ --static char *convert_date(time, date) -- int time, date; -+static char *convert_date(int time, int date) - { static char buf[30]; - int hour; - int minute; -@@ -72,9 +71,7 @@ static char *convert_date(time, date) - /* - * convert from little endian to big endian four byte object - */ --static unsigned long --vhtonl(lend) --unsigned long lend ; -+static unsigned long vhtonl(unsigned long lend) - { - unsigned long bend ; - unsigned char *lp, *bp ; -@@ -90,9 +87,7 @@ unsigned long lend ; - return(bend) ; - } - --static void babble(name, dir) -- char *name; -- struct area_dir *dir; -+static void babble(char *name, struct area_dir *dir) - { - printf("%s is a %ldx%ld McIDAS areafile from %s at %s (%ld, %ld) (%ld, %ld)\n", - name, -@@ -105,8 +100,7 @@ static void babble(name, dir) - dir->eres) ; - } - --static void swap_bytes(dir) -- struct area_dir *dir; -+static void swap_bytes(struct area_dir *dir) - { - unsigned long *begin ; - unsigned long *ulp ; -@@ -119,8 +113,7 @@ static void swap_bytes(dir) - } - - /* ARGSUSED */ --int mcidasIdent(fullname, name) -- char *fullname, *name; -+int mcidasIdent(char *fullname, char *name) - { ZFILE *zf; - struct area_dir dir ; - int r; -@@ -155,9 +148,7 @@ int mcidasIdent(fullname, name) - } - - --Image *mcidasLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *mcidasLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - struct area_dir dir; - struct navigation nav; -diff -up xloadimage.4.1/mc_tables.c.c23 xloadimage.4.1/mc_tables.c ---- xloadimage.4.1/mc_tables.c.c23 1993-10-21 17:28:39.000000000 -0400 -+++ xloadimage.4.1/mc_tables.c 2025-02-24 15:41:17.687934866 -0500 -@@ -7,9 +7,7 @@ - * return a string describing the sensor source. - * - */ --char * --mc_sensor(sscode) --int sscode ; -+char *mc_sensor(int sscode) - { - switch (sscode) { - case 0 : return("Non-Image Derived Data") ; -diff -up xloadimage.4.1/merge.c.c23 xloadimage.4.1/merge.c ---- xloadimage.4.1/merge.c.c23 2025-02-24 15:41:17.657309590 -0500 -+++ xloadimage.4.1/merge.c 2025-02-24 15:41:17.687991174 -0500 -@@ -15,10 +15,7 @@ - * 24-bit. this saves a lot of space. - */ - --static Image *bitmapToBitmap(src, dest, atx, aty, clipw, cliph, verbose) -- Image *src, *dest; -- unsigned int atx, aty, clipw, cliph; -- unsigned int verbose; -+static Image *bitmapToBitmap(Image *src, Image *dest, unsigned int atx, unsigned int aty, unsigned int clipw, unsigned int cliph, unsigned int verbose) - { unsigned int destlinelen, srclinelen; - unsigned int deststart; - unsigned int flip; -@@ -72,10 +69,7 @@ static Image *bitmapToBitmap(src, dest, - return(dest); - } - --static Image *anyToTrue(src, dest, atx, aty, clipw, cliph, verbose) -- Image *src, *dest; -- unsigned int atx, aty, clipw, cliph; -- unsigned int verbose; -+static Image *anyToTrue(Image *src, Image *dest, unsigned int atx, unsigned int aty, unsigned int clipw, unsigned int cliph, unsigned int verbose) - { Pixel fg, bg; - unsigned int destlinelen, srclinelen; - unsigned int deststart; -@@ -165,11 +159,7 @@ static Image *anyToTrue(src, dest, atx, - /* put src image on dest image - */ - --Image *merge(dest, src, atx, aty, verbose) -- Image *dest; -- Image *src; -- int atx, aty; -- unsigned int verbose; -+Image *merge(Image *dest, Image *src, int atx, int aty, unsigned int verbose) - { int clipw, cliph; - int clipped = 0; - Image *newimage; -@@ -239,10 +229,7 @@ Image *merge(dest, src, atx, aty, verbos - - /* this creates an image of the specified size by tiling a base image - */ --Image *tile(image, x, y, width, height, verbose) -- Image *image; -- int x, y; -- unsigned int width, height, verbose; -+Image *tile(Image *image, int x, int y, unsigned int width, unsigned int height, unsigned int verbose) - { Image *base, *tmp; - int nx, ny; - -diff -up xloadimage.4.1/misc.c.c23 xloadimage.4.1/misc.c ---- xloadimage.4.1/misc.c.c23 2025-02-24 15:41:17.647130948 -0500 -+++ xloadimage.4.1/misc.c 2025-02-24 15:41:17.688055406 -0500 -@@ -26,8 +26,7 @@ extern char *BuildDate; - extern char *BuildUser; - extern char *BuildSystem; - --static char *signalName(sig) -- int sig; -+static char *signalName(int sig) - { static char buf[32]; - - switch (sig) { -@@ -57,8 +56,7 @@ void memoryExhausted() - exit(1); - } - --void internalError(sig) -- int sig; -+void internalError(int sig) - { static int handling_error= 0; - int a, b; - Screen *screen; -@@ -131,8 +129,7 @@ void usage() - /* NOTREACHED */ - } - --char *tail(path) -- char *path; -+char *tail(char *path) - { int s; - char *t; - -@@ -146,9 +143,7 @@ char *tail(path) - /* simple error handler. this provides us with some kind of error recovery. - */ - --int errorHandler(disp, error) -- Display *disp; -- XErrorEvent *error; -+int errorHandler(Display *disp, XErrorEvent *error) - { char errortext[BUFSIZ]; - - XGetErrorText(disp, error->error_code, errortext, BUFSIZ); -@@ -183,11 +178,12 @@ int errorHandler(disp, error) - - #define EOS '\0' /* C string terminator */ - -+/* char *s1; -> string to be searched */ -+/* char *s2; -> search-pattern string */ -+ - char * /* returns -> leftmost occurrence, - or null pointer if not present */ --findstr( s1, s2 ) -- char *s1; /* -> string to be searched */ -- char *s2; /* -> search-pattern string */ -+findstr( char *s1, char *s2 ) - { - register byte *t; /* -> text character being tested */ - register byte *p; /* -> pattern char being tested */ -diff -up xloadimage.4.1/new.c.c23 xloadimage.4.1/new.c ---- xloadimage.4.1/new.c.c23 2025-02-24 15:41:17.675792517 -0500 -+++ xloadimage.4.1/new.c 2025-02-24 15:41:17.688122538 -0500 -@@ -55,8 +55,7 @@ unsigned long DepthToColorsTable[] = { - /* 32 */ 2147483648UL /* bigger than unsigned int; this is good enough */ - }; - --unsigned long colorsToDepth(ncolors) -- unsigned long ncolors; -+unsigned long colorsToDepth(unsigned long ncolors) - { unsigned long a; - - for (a= 0; (a < 32) && (DepthToColorsTable[a] < ncolors); a++) -@@ -78,9 +77,7 @@ static unsigned int ovmul(unsigned int a - return r; - } - --void goodImage(image, func) -- Image *image; -- char *func; -+void goodImage(Image *image, char *func) - { - if (!image) { - printf("%s: nil image\n", func); -@@ -96,8 +93,7 @@ void goodImage(image, func) - exit(0); - } - } --char *dupString(s) -- char *s; -+char *dupString(char *s) - { char *d; - - if (!s) -@@ -107,9 +103,7 @@ char *dupString(s) - return(d); - } - --void newRGBMapData(rgb, size) -- RGBMap *rgb; -- unsigned int size; -+void newRGBMapData(RGBMap *rgb, unsigned int size) - { - rgb->used= 0; - rgb->size= size; -@@ -119,16 +113,14 @@ void newRGBMapData(rgb, size) - rgb->blue= (Intensity *)lmalloc(sizeof(Intensity) * size); - } - --void freeRGBMapData(rgb) -- RGBMap *rgb; -+void freeRGBMapData(RGBMap *rgb) - { - lfree((byte *)rgb->red); - lfree((byte *)rgb->green); - lfree((byte *)rgb->blue); - } - --Image *newBitImage(width, height) -- unsigned int width, height; -+Image *newBitImage(unsigned int width, unsigned int height) - { Image *image; - unsigned int linelen; - -@@ -147,8 +139,7 @@ Image *newBitImage(width, height) - return(image); - } - --Image *newRGBImage(width, height, depth) -- unsigned int width, height, depth; -+Image *newRGBImage(unsigned int width, unsigned int height, unsigned int depth) - { Image *image; - unsigned int pixlen, numcolors; - -@@ -168,8 +159,7 @@ Image *newRGBImage(width, height, depth) - return(image); - } - --Image *newTrueImage(width, height) -- unsigned int width, height; -+Image *newTrueImage(unsigned int width, unsigned int height) - { Image *image; - - image= (Image *)lmalloc(sizeof(Image)); -@@ -185,8 +175,7 @@ Image *newTrueImage(width, height) - return(image); - } - --void freeImageData(image) -- Image *image; -+void freeImageData(Image *image) - { - if (image->title) { - lfree((byte *)image->title); -@@ -197,8 +186,7 @@ void freeImageData(image) - lfree(image->data); - } - --void freeImage(image) -- Image *image; -+void freeImage(Image *image) - { - goodImage(image, "freeImage"); - freeImageData(image); -@@ -206,8 +194,7 @@ void freeImage(image) - lfree((byte *)image); - } - --byte *lmalloc(size) -- unsigned int size; -+byte *lmalloc(unsigned int size) - { byte *area; - - if (size == 0) { -@@ -222,8 +209,7 @@ byte *lmalloc(size) - return(area); - } - --byte *lcalloc(size) -- unsigned int size; -+byte *lcalloc(unsigned int size) - { byte *area; - - if (size == 0) { -@@ -238,8 +224,7 @@ byte *lcalloc(size) - return(area); - } - --void lfree(area) -- byte *area; -+void lfree(byte *area) - { - free(area); - } -diff -up xloadimage.4.1/niff.c.c23 xloadimage.4.1/niff.c ---- xloadimage.4.1/niff.c.c23 2025-02-24 15:41:17.647459269 -0500 -+++ xloadimage.4.1/niff.c 2025-02-24 15:41:17.688188564 -0500 -@@ -14,10 +14,7 @@ - #endif - #include "niff.h" - --static void babble(name, header, title) -- char *name; -- struct niff_header *header; -- char *title; -+static void babble(char *name, struct niff_header *header, char *title) - { - printf("%s is a %ldx%ld ", name, - memToVal(header->width, 4), -@@ -44,10 +41,7 @@ static void babble(name, header, title) - printf("\n"); - } - --static int readHeader(zf, header, rtitle) -- ZFILE *zf; -- struct niff_header *header; -- char **rtitle; -+static int readHeader(ZFILE *zf, struct niff_header *header, char **rtitle) - { unsigned int title_len; - char *title = NULL; - -@@ -82,8 +76,7 @@ static int readHeader(zf, header, rtitle - return(1); - } - --int niffIdent(fullname, name) -- char *fullname, *name; -+int niffIdent(char *fullname, char *name) - { ZFILE *zf; - struct niff_header header; - char *title; -@@ -99,9 +92,7 @@ int niffIdent(fullname, name) - return(1); - } - --static int readColormap(zf, image) -- ZFILE *zf; -- Image *image; -+static int readColormap(ZFILE *zf, Image *image) - { unsigned int a; - struct niff_cmap cmap; - -@@ -117,9 +108,7 @@ static int readColormap(zf, image) - return(1); - } - --Image *niffLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *niffLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - struct niff_header header; - char *title; -@@ -185,11 +174,7 @@ Image *niffLoad(fullname, name, verbose) - /* this takes an Image and dumps it into a file in NIFF format. returns - * zero if successful. - */ --void niffDump(image, options, filename, verbose) -- Image *image; -- char *options; /* ignored */ -- char *filename; -- int verbose; -+void niffDump(Image *image, char *options, char *filename, int verbose) - { FILE *f; - unsigned int a; - struct niff_header header; -diff -up xloadimage.4.1/options.c.c23 xloadimage.4.1/options.c ---- xloadimage.4.1/options.c.c23 2025-02-24 15:41:17.685111278 -0500 -+++ xloadimage.4.1/options.c 2025-02-24 15:41:17.688257094 -0500 -@@ -221,8 +221,7 @@ static void listOptions() - } - } - --static int helpOnOption(option) -- char *option; -+static int helpOnOption(char *option) - { int a, foundone; - - if (*option == '-') -@@ -242,15 +241,13 @@ static int helpOnOption(option) - return(foundone); - } - --static void literalMindedUser(s) -- char *s; -+static void literalMindedUser(char *s) - { - printf("The quotes around %s are unnecessary. You don't have to be so\n\ - literal-minded!\n", s); - } - --void help(option) -- char *option; -+void help(char *option) - { char buf[BUFSIZ]; - - /* batch help facility -@@ -320,8 +317,7 @@ OptionSet *newOptionSet() - return(optset); - } - --Option *newOption(type) -- OptionId type; -+Option *newOption(OptionId type) - { Option *opt; - - opt= (Option *)lmalloc(sizeof(Option)); -@@ -330,9 +326,7 @@ Option *newOption(type) - return(opt); - } - --void addOption(optset, newopt) -- OptionSet *optset; -- Option *newopt; -+void addOption(OptionSet *optset, Option *newopt) - { Option *opt; - - if (optset->options) { -@@ -347,9 +341,7 @@ void addOption(optset, newopt) - - /* return the option structure for a typed option - */ --Option *getOption(optset, type) -- OptionSet *optset; -- OptionId type; -+Option *getOption(OptionSet *optset, OptionId type) - { Option *opt; - - if (optset) -@@ -361,9 +353,7 @@ Option *getOption(optset, type) - - /* this kills all options of a particular type in a particular set - */ --void killOption(optset, type) -- OptionSet *optset; -- OptionId type; -+void killOption(OptionSet *optset, OptionId type) - { Option *opt; - - if (!optset) -@@ -373,8 +363,7 @@ void killOption(optset, type) - opt->type= OPT_IGNORE; - } - --OptionId optionNumber(arg) -- char *arg; -+OptionId optionNumber(char *arg) - { int a, b; - - if ((*arg) != '-') -@@ -390,8 +379,7 @@ OptionId optionNumber(arg) - return(OPT_BADOPT); - } - --static char *optionName(type) -- OptionId type; -+static char *optionName(OptionId type) - { int a; - - for (a= 0; Options[a].name; a++) -@@ -400,16 +388,13 @@ static char *optionName(type) - return(""); - } - --static void optionUsage(type) -- OptionId type; -+static void optionUsage(OptionId type) - { - helpOnOption(optionName(type)); - exit(1); - } - --static int getInteger(type, s) -- OptionId type; -- char *s; -+static int getInteger(OptionId type, char *s) - { unsigned int ret; - - if (strncmp(s, "0x", 2)) { -@@ -424,9 +409,7 @@ static int getInteger(type, s) - /* NOTREACHED */ - } - --static float getFloat(type, s) -- int type; -- char *s; -+static float getFloat(int type, char *s) - { - float ret; - -@@ -442,11 +425,7 @@ static float getFloat(type, s) - /* process the argument list into an option array. the first option in - * the returned list is the set of global options. - */ --void processOptions(argc, argv, rglobal, rimage) -- int argc; -- char *argv[]; -- OptionSet **rglobal; -- OptionSet **rimage; -+void processOptions(int argc, char *argv[], OptionSet **rglobal, OptionSet **rimage) - { OptionSet *global_options= newOptionSet(); - OptionSet *image_options, *curset; - Option *newopt; -@@ -872,10 +851,7 @@ void processOptions(argc, argv, rglobal, - /* this is used by readers/dumpers to parse options strings of the - * form name[=value][,...] - */ --int getNextTypeOption(opt_string, name, value) -- char **opt_string; -- char **name; -- char **value; -+int getNextTypeOption(char **opt_string, char **name, char **value) - { - static char option_name[BUFSIZ]; - static char option_value[BUFSIZ]; -diff -up xloadimage.4.1/options.h.c23 xloadimage.4.1/options.h ---- xloadimage.4.1/options.h.c23 2025-02-24 15:41:17.677037106 -0500 -+++ xloadimage.4.1/options.h 2025-02-24 15:41:17.688349238 -0500 -@@ -92,10 +92,10 @@ typedef struct option_array { - char *description; /* description of this option */ - } OptionArray; - --Option *getOption(); /* options.c */ --Option *newOption(); --OptionId optionNumber(); --int getNextTypeOption(); -+Option *getOption(OptionSet *, OptionId); /* options.c */ -+Option *newOption(OptionId); -+OptionId optionNumber(char *); -+int getNextTypeOption(char **, char **, char **); - - /* imagetypes.c */ - Image *loadImage _ArgProto((OptionSet *globalopts, OptionSet *options, -diff -up xloadimage.4.1/pbm.c.c23 xloadimage.4.1/pbm.c ---- xloadimage.4.1/pbm.c.c23 2025-02-24 15:41:17.633207666 -0500 -+++ xloadimage.4.1/pbm.c 2025-02-24 15:41:17.688411768 -0500 -@@ -56,8 +56,7 @@ static void initializeTable() - Initialized= 1; - } - --static int pbmReadChar(zf) -- ZFILE *zf; -+static int pbmReadChar(ZFILE *zf) - { int c; - - if ((c= zgetc(zf)) == EOF) { -@@ -72,8 +71,7 @@ static int pbmReadChar(zf) - return(c); - } - --static int pbmReadInt(zf) -- ZFILE *zf; -+static int pbmReadInt(ZFILE *zf) - { int c, value; - - for (;;) { -@@ -95,11 +93,7 @@ static int pbmReadInt(zf) - } - } - --static int isPBM(zf, name, width, height, maxval, verbose) -- ZFILE *zf; -- char *name; -- int *width, *height, *maxval; -- unsigned int verbose; -+static int isPBM(ZFILE *zf, char *name, int *width, int *height, int *maxval, unsigned int verbose) - { byte buf[4]; - - if (! Initialized) -@@ -172,8 +166,7 @@ static int isPBM(zf, name, width, height - return(NOTPBM); - } - --int pbmIdent(fullname, name) -- char *fullname, *name; -+int pbmIdent(char *fullname, char *name) - { ZFILE *zf; - int width, height, maxval, ret; - -@@ -185,9 +178,7 @@ int pbmIdent(fullname, name) - return(ret != NOTPBM); - } - --Image *pbmLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *pbmLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - Image *image = NULL; - int pbm_type; -@@ -449,11 +440,7 @@ Image *pbmLoad(fullname, name, verbose) - return(image); - } - --void pbmDump(image, options, file, verbose) -- Image *image; -- char *options; -- char *file; -- int verbose; -+void pbmDump(Image *image, char *options, char *file, int verbose) - { - FILE *f; - byte *srcptr; -diff -up xloadimage.4.1/pcx.c.c23 xloadimage.4.1/pcx.c ---- xloadimage.4.1/pcx.c.c23 2025-02-24 15:41:17.647823605 -0500 -+++ xloadimage.4.1/pcx.c 2025-02-24 15:41:17.688491594 -0500 -@@ -40,8 +40,7 @@ - */ - - --unsigned int pcxIdent ( fullname, name ) -- char *fullname, *name; -+unsigned int pcxIdent ( char *fullname, char *name ) - { - ZFILE *zf; - unsigned int ret; -@@ -92,11 +91,9 @@ unsigned int pcxIdent ( fullname, name ) - ** Returns no value (void function) - */ - --static void PCX_Load_Raster ( zf, image, depth ) -- ZFILE *zf; -- Image *image; -- int depth; -- /* Assertion : depth is 1 or 8 */ -+/* Assertion : depth is 1 or 8 */ -+ -+static void PCX_Load_Raster ( ZFILE *zf, Image *image, int depth ) - { - byte *ptr = &(image->data[0]); - int row = 0; -@@ -161,14 +158,11 @@ static void PCX_Load_Raster ( zf, image, - ** Returns no value (void function) - */ - -+/* Assertion : */ -+/* bpp is 1, 2 or 4 only, dividing 8 without remainder anyways, */ -+/* bpp * nr_pl <= 8 */ - --static void PCX_Planes ( zf, image, bpp, nr_pl ) -- ZFILE *zf; -- Image *image; -- int bpp, nr_pl; -- /* Assertion : */ -- /* bpp is 1, 2 or 4 only, dividing 8 without remainder anyways, */ -- /* bpp * nr_pl <= 8 */ -+static void PCX_Planes ( ZFILE *zf, Image *image, int bpp, int nr_pl ) - { - byte *ptr, *sptr; - register byte *tptr; -@@ -255,9 +249,7 @@ static void PCX_Planes ( zf, image, bpp, - */ - - --static void PCX_LoadImage ( zf ,image ) -- ZFILE *zf; -- Image *image; -+static void PCX_LoadImage ( ZFILE *zf, Image *image ) - { - switch (PCXH->Zbpp) { /* What kind of plane do we have ? */ - case 1 : /* Bit planes */ -@@ -292,9 +284,7 @@ static void PCX_LoadImage ( zf ,image ) - ** Returns pointer to allocated struct if successful, NULL otherwise - */ - --Image *pcxLoad ( fullname, name, verbose ) -- char *fullname, *name; -- unsigned int verbose; -+Image *pcxLoad ( char *fullname, char *name, unsigned int verbose ) - { - ZFILE *zf; - unsigned int i; -diff -up xloadimage.4.1/pdsuncomp.c.c23 xloadimage.4.1/pdsuncomp.c ---- xloadimage.4.1/pdsuncomp.c.c23 2025-02-24 15:41:17.647955885 -0500 -+++ xloadimage.4.1/pdsuncomp.c 2025-02-24 15:41:17.688563610 -0500 -@@ -60,15 +60,15 @@ NODE *tree; /* huffma - static long hist[511]; /* histogram for huffman code */ - static int Decompressing= 0; /* flag for pdsRead() */ - --static NODE *new_node(); --static long int free_node(); -+static NODE *new_node(short int); -+static long int free_node(NODE *, long int); - --NODE *huff_tree(hist) - /**************************************************************************** - *_TITLE huff_tree - constructs the Huffman tree; returns pointer to root * --*_ARGS TYPE NAME I/O DESCRIPTION */ -- long int *hist; /* I First difference histogram */ -+*_ARGS TYPE NAME I/O DESCRIPTION * -+* long int *hist I First difference histogram */ - -+NODE *huff_tree(long int *hist) - { - /* Local variables used */ - long int freq_list[512]; /* Histogram frequency list */ -@@ -87,7 +87,7 @@ NODE *huff_tree(hist) - register NODE *temp; /* Temporary node pointer */ - - /* Functions called */ -- void sort_freq(); -+ void sort_freq(long int *, NODE **, long int); - - /*************************************************************************** - Allocate the array of nodes from memory and initialize these with numbers -@@ -161,12 +161,12 @@ NODE *huff_tree(hist) - return temp; - } - --static NODE *new_node(value) - /**************************************************************************** - *_TITLE new_node - allocates a NODE structure and returns a pointer to it * --*_ARGS TYPE NAME I/O DESCRIPTION */ -- short int value; /* I Value to assign to DN field */ -+*_ARGS TYPE NAME I/O DESCRIPTION * -+* short int value; I Value to assign to DN field */ - -+static NODE *new_node(short int value) - { - NODE *temp; /* Pointer to the memory block */ - -@@ -181,14 +181,14 @@ static NODE *new_node(value) - return temp; - } - --void sort_freq(freq_list,node_list,num_freq) - /**************************************************************************** - *_TITLE sort_freq - sorts frequency and node lists in increasing freq. order* --*_ARGS TYPE NAME I/O DESCRIPTION */ -- long int *freq_list; /* I Pointer to frequency list */ -- NODE **node_list; /* I Pointer to array of node pointers */ -- long int num_freq; /* I Number of values in freq list */ -+*_ARGS TYPE NAME I/O DESCRIPTION * -+* long int *freq_list; I Pointer to frequency list * -+* NODE **node_list; I Pointer to array of node pointers * -+* long int num_freq; I Number of values in freq list */ - -+void sort_freq(long int *freq_list, NODE **node_list, long int num_freq) - { - /* Local Variables */ - register long int *i; /* primary pointer into freq_list */ -@@ -243,8 +243,7 @@ void sort_freq(freq_list,node_list,num_f - */ - - #ifdef UNUSED_FUNCTIONS --static void free_tree(nfreed) -- long int *nfreed; /* Return of total count of nodes freed. */ -+static void free_tree(long int *nfreed) - { - long int total_free = 0; - -@@ -272,11 +271,11 @@ static void free_tree(nfreed) - * and is not done by any of these routines. - * - * 16-AUG-89 Kris Becker U.S.G.S Flagstaff Original Version -+ * NODE *pnode; I Pointer to node to free -+ * long int total_free; I Total number of freed nodes - */ - --static long int free_node(pnode,total_free) -- NODE *pnode; /* I Pointer to node to free */ -- long int total_free; /* I Total number of freed nodes */ -+static long int free_node(NODE *pnode, long int total_free) - { - if (pnode == (NODE *) NULL) - return(total_free); -@@ -291,13 +290,12 @@ static long int free_node(pnode,total_fr - } - - /* pdsDecompress - decompresses Huffman coded compressed image lines -+ * char *ibuf; I Compressed data buffer -+ * char *obuf; O Decompressed image line -+ * long int *nin; I Number of bytes on input buffer -+ * long int *nout; I Number of bytes in output buffer - */ --static int decompress(ibuf,obuf,nin,nout) -- char *ibuf; /* I Compressed data buffer */ -- char *obuf; /* O Decompressed image line */ -- long int *nin; /* I Number of bytes on input buffer */ -- long int *nout; /* I Number of bytes in output buffer */ -- -+static int decompress(char *ibuf, char *obuf, long int *nin, long int *nout) - { - /* Local Variables */ - register NODE *ptr = tree; /* pointer to position in tree */ -@@ -348,9 +346,7 @@ static int decompress(ibuf,obuf,nin,nout - /* */ - /*********************************************************************/ - --static int read_var(zf, ibuf) -- ZFILE *zf; -- char *ibuf; -+static int read_var(ZFILE *zf, char *ibuf) - { - int length,result,nlen; - unsigned char buf[2]; -@@ -362,8 +358,7 @@ static int read_var(zf, ibuf) - return(length); - } - --void skip_record(zf) -- ZFILE *zf; -+void skip_record(ZFILE *zf) - { - unsigned int value; - unsigned char buf[2]; -@@ -380,9 +375,7 @@ void skip_record(zf) - * reads the histogram table and initializes the huffman tree. - */ - --void pdsInit(zf, type) -- ZFILE *zf; -- int type; -+void pdsInit(ZFILE *zf, int type) - { - if (type == PDSVARIABLE) { - -@@ -409,10 +402,7 @@ void pdsInit(zf, type) - /* function which will read pds data and do decompression if necessary. - */ - --int pdsRead(zf, buf, size) -- ZFILE *zf; -- char *buf; -- int size; -+int pdsRead(ZFILE *zf, char *buf, int size) - { - static char obuf[2048]; - char ibuf[2048]; -@@ -427,7 +417,7 @@ int pdsRead(zf, buf, size) - in_length= read_var(zf, ibuf); - if (in_length < 0) - return(-1); -- out_length= decompress(ibuf, obuf, &in_length, &out_length); -+ out_length= decompress(ibuf, obuf, (long int *) &in_length, (long int *) &out_length); - if (out_length < 0) - return(-1); - out_ptr= 0; -diff -up xloadimage.4.1/reduce.c.c23 xloadimage.4.1/reduce.c ---- xloadimage.4.1/reduce.c.c23 2025-02-24 15:41:17.664014160 -0500 -+++ xloadimage.4.1/reduce.c 2025-02-24 15:41:17.688658642 -0500 -@@ -38,9 +38,7 @@ void initSquareTable() - squareInit= 1; - } - --unsigned long colorDistance(rgb, a, b) -- RGBMap *rgb; -- Pixel a, b; -+unsigned long colorDistance(RGBMap *rgb, Pixel a, Pixel b) - { - return(squareTable[DIST(*(rgb->red + a), *(rgb->red + b)) >> 1] + - squareTable[DIST(*(rgb->green + a), *(rgb->green + b)) >> 1] + -@@ -79,7 +77,7 @@ unsigned long colorDistance(rgb, a, b) - struct color_area { - unsigned short *pixels; /* array of pixel values in this area */ - unsigned short num_pixels; /* size of above array */ -- int (*sort_func)(); /* predicate func to sort with before -+ int (*sort_func)(const void *, const void *); /* predicate func to sort with before - * splitting */ - unsigned long pixel_count; /* # of image pixels we represent */ - struct color_area *prev, *next; -@@ -88,16 +86,18 @@ struct color_area { - /* predicate functions for qsort - */ - --static int sortRGB(p1, p2) -- unsigned short *p1, *p2; -+static int sortRGB(const void* pp1, const void* pp2) - { unsigned int red1, green1, blue1, red2, green2, blue2; - -- red1= RED_INTENSITY(*p1); -- green1= GREEN_INTENSITY(*p1); -- blue1= BLUE_INTENSITY(*p1); -- red2= RED_INTENSITY(*p2); -- green2= GREEN_INTENSITY(*p2); -- blue2= BLUE_INTENSITY(*p2); -+ unsigned short p1 = *(unsigned short *)pp1; -+ unsigned short p2 = *(unsigned short *)pp2; -+ -+ red1= RED_INTENSITY(p1); -+ green1= GREEN_INTENSITY(p1); -+ blue1= BLUE_INTENSITY(p1); -+ red2= RED_INTENSITY(p2); -+ green2= GREEN_INTENSITY(p2); -+ blue2= BLUE_INTENSITY(p2); - - if (red1 == red2) - if (green1 == green2) -@@ -115,16 +115,18 @@ static int sortRGB(p1, p2) - return(1); - } - --static int sortRBG(p1, p2) -- unsigned short *p1, *p2; -+static int sortRBG(const void* pp1, const void* pp2) - { unsigned int red1, green1, blue1, red2, green2, blue2; - -- red1= RED_INTENSITY(*p1); -- green1= GREEN_INTENSITY(*p1); -- blue1= BLUE_INTENSITY(*p1); -- red2= RED_INTENSITY(*p2); -- green2= GREEN_INTENSITY(*p2); -- blue2= BLUE_INTENSITY(*p2); -+ unsigned short p1 = *(unsigned short *)pp1; -+ unsigned short p2 = *(unsigned short *)pp2; -+ -+ red1= RED_INTENSITY(p1); -+ green1= GREEN_INTENSITY(p1); -+ blue1= BLUE_INTENSITY(p1); -+ red2= RED_INTENSITY(p2); -+ green2= GREEN_INTENSITY(p2); -+ blue2= BLUE_INTENSITY(p2); - - if (red1 == red2) - if (blue1 == blue2) -@@ -142,16 +144,18 @@ static int sortRBG(p1, p2) - return(1); - } - --static int sortGRB(p1, p2) -- unsigned short *p1, *p2; -+static int sortGRB(const void *pp1, const void *pp2) - { unsigned int red1, green1, blue1, red2, green2, blue2; - -- red1= RED_INTENSITY(*p1); -- green1= GREEN_INTENSITY(*p1); -- blue1= BLUE_INTENSITY(*p1); -- red2= RED_INTENSITY(*p2); -- green2= GREEN_INTENSITY(*p2); -- blue2= BLUE_INTENSITY(*p2); -+ unsigned short p1 = *(unsigned short *)pp1; -+ unsigned short p2 = *(unsigned short *)pp2; -+ -+ red1= RED_INTENSITY(p1); -+ green1= GREEN_INTENSITY(p1); -+ blue1= BLUE_INTENSITY(p1); -+ red2= RED_INTENSITY(p2); -+ green2= GREEN_INTENSITY(p2); -+ blue2= BLUE_INTENSITY(p2); - - if (green1 == green2) - if (red1 == red2) -@@ -169,16 +173,18 @@ static int sortGRB(p1, p2) - return(1); - } - --static int sortGBR(p1, p2) -- unsigned short *p1, *p2; -+static int sortGBR(const void *pp1, const void *pp2) - { unsigned int red1, green1, blue1, red2, green2, blue2; - -- red1= RED_INTENSITY(*p1); -- green1= GREEN_INTENSITY(*p1); -- blue1= BLUE_INTENSITY(*p1); -- red2= RED_INTENSITY(*p2); -- green2= GREEN_INTENSITY(*p2); -- blue2= BLUE_INTENSITY(*p2); -+ unsigned short p1 = *(unsigned short *)pp1; -+ unsigned short p2 = *(unsigned short *)pp2; -+ -+ red1= RED_INTENSITY(p1); -+ green1= GREEN_INTENSITY(p1); -+ blue1= BLUE_INTENSITY(p1); -+ red2= RED_INTENSITY(p2); -+ green2= GREEN_INTENSITY(p2); -+ blue2= BLUE_INTENSITY(p2); - - if (green1 == green2) - if (blue1 == blue2) -@@ -196,16 +202,18 @@ static int sortGBR(p1, p2) - return(1); - } - --static int sortBRG(p1, p2) -- unsigned short *p1, *p2; -+static int sortBRG(const void *pp1, const void *pp2) - { unsigned int red1, green1, blue1, red2, green2, blue2; - -- red1= RED_INTENSITY(*p1); -- green1= GREEN_INTENSITY(*p1); -- blue1= BLUE_INTENSITY(*p1); -- red2= RED_INTENSITY(*p2); -- green2= GREEN_INTENSITY(*p2); -- blue2= BLUE_INTENSITY(*p2); -+ unsigned short p1 = *(unsigned short *)pp1; -+ unsigned short p2 = *(unsigned short *)pp2; -+ -+ red1= RED_INTENSITY(p1); -+ green1= GREEN_INTENSITY(p1); -+ blue1= BLUE_INTENSITY(p1); -+ red2= RED_INTENSITY(p2); -+ green2= GREEN_INTENSITY(p2); -+ blue2= BLUE_INTENSITY(p2); - - if (blue1 == blue2) - if (red1 == red2) -@@ -223,16 +231,18 @@ static int sortBRG(p1, p2) - return(1); - } - --static int sortBGR(p1, p2) -- unsigned short *p1, *p2; -+static int sortBGR(const void *pp1, const void *pp2) - { unsigned int red1, green1, blue1, red2, green2, blue2; - -- red1= RED_INTENSITY(*p1); -- green1= GREEN_INTENSITY(*p1); -- blue1= BLUE_INTENSITY(*p1); -- red2= RED_INTENSITY(*p2); -- green2= GREEN_INTENSITY(*p2); -- blue2= BLUE_INTENSITY(*p2); -+ unsigned short p1 = *(unsigned short *)pp1; -+ unsigned short p2 = *(unsigned short *)pp2; -+ -+ red1= RED_INTENSITY(p1); -+ green1= GREEN_INTENSITY(p1); -+ blue1= BLUE_INTENSITY(p1); -+ red2= RED_INTENSITY(p2); -+ green2= GREEN_INTENSITY(p2); -+ blue2= BLUE_INTENSITY(p2); - - if (blue1 == blue2) - if (green1 == green2) -@@ -254,9 +264,7 @@ static int sortBGR(p1, p2) - * the color area in the list of color areas. - */ - --static void insertColorArea(pixel_counts, rlargest, rsmallest, area) -- unsigned long *pixel_counts; -- struct color_area **rlargest, **rsmallest, *area; -+static void insertColorArea(unsigned long *pixel_counts, struct color_area **rlargest, struct color_area **rsmallest, struct color_area *area) - { int a; - unsigned int red, green, blue; - unsigned int min_red, min_green, min_blue; -@@ -362,9 +370,7 @@ static void insertColorArea(pixel_counts - *rsmallest= smallest; - } - --Image *reduce(image, n, verbose) -- Image *image; -- unsigned int n, verbose; -+Image *reduce(Image *image, unsigned int n, unsigned int verbose) - { unsigned long pixel_counts[32768]; /* pixel occurrance histogram */ - unsigned short pixel_array[32768]; - unsigned long count, midpoint; -@@ -573,8 +579,7 @@ Image *reduce(image, n, verbose) - /* expand an image into a true color image - */ - --Image *expand(image) -- Image *image; -+Image *expand(Image *image) - { - Image *new_image; - int x, y; -@@ -630,8 +635,7 @@ Image *expand(image) - - /* this function "flattens" a 1-bit RGB image into a bitmap image if possible. - */ --Image *flatten(image) -- Image *image; -+Image *flatten(Image *image) - { int x, y, linelen; - Image *new; - byte *sp, *dp, *last_dp, mask; -diff -up xloadimage.4.1/rle.c.c23 xloadimage.4.1/rle.c ---- xloadimage.4.1/rle.c.c23 2025-02-24 15:41:17.648289651 -0500 -+++ xloadimage.4.1/rle.c 2025-02-24 15:41:17.688752136 -0500 -@@ -25,7 +25,7 @@ - # define debug(xx) - #endif - --void dithermap(); -+void dithermap(int, double, int (*)[3], int*, int*, int(*)[16]); - - /* input file stuff */ - static int ptype; /* picture type : */ -@@ -53,8 +53,7 @@ int magic[16][16]; - int modN[256]; - int divN[256]; - --int rleIdent(fullname, name) -- char *fullname, *name; -+int rleIdent(char *fullname, char *name) - { - ZFILE *rlefile; - int x_len,y_len; -@@ -137,9 +136,7 @@ int rleIdent(fullname, name) - } - } - --Image *rleLoad(fullname,name,verbose) -- char *fullname,*name; -- unsigned int verbose; -+Image *rleLoad(char *fullname, char *name, unsigned int verbose) - { - int x_len, y_len; - int i,j; -@@ -395,9 +392,7 @@ Image *rleLoad(fullname,name,verbose) - #define DMAP(v,x,y) (modN[v]>magic[x][y] ? divN[v] + 1 : divN[v]) - - /* run the black and white through its map */ --void bw_m_line(dp,number) -- int number; -- register unsigned char *dp; -+void bw_m_line(register unsigned char *dp, int number) - { - register unsigned char *r; - register int i; -@@ -409,9 +404,7 @@ void bw_m_line(dp,number) - } - - /* convert a colour line with map to 8 bits per pixel */ --void c_m_line(dp,number,line) -- int number,line; -- register unsigned char *dp; -+void c_m_line(register unsigned char *dp, int number, int line) - { - register unsigned char *r, *g, *b; - register int i, col, row; -diff -up xloadimage.4.1/rle.h.c23 xloadimage.4.1/rle.h ---- xloadimage.4.1/rle.h.c23 2025-02-24 15:41:17.648411806 -0500 -+++ xloadimage.4.1/rle.h 2025-02-24 15:41:17.688817747 -0500 -@@ -140,42 +140,25 @@ extern struct sv_globals { - * buildmap - build a more usable colormap from data in globals struct. - */ - extern rle_pixel ** --buildmap(); --/* ( globals, minmap, gamma ) -- * struct sv_globals * globals; -- * int minmap; -- * double gamma; -- */ -+buildmap(struct sv_globals *globals, int minmap, double gamma); - - /* - * rle_getcom - get a specific comment from the image comments. - */ - extern char * --rle_getcom(); --/* ( name, globals ) -- * char * name; -- * struct sv_globals * globals; -- */ -+rle_getcom(char *name, struct sv_globals *globals); - - /* - * rle_putcom - put (or replace) a comment into the image comments. - */ - extern char * --rle_putcom(); --/* ( value, globals ) -- * char * value; -- * struct sv_globals * globals; -- */ -+rle_putcom(char *value, struct sv_globals *globals); - - /* - * rle_delcom - delete a specific comment from the image comments. - */ - extern char * --rle_delcom(); --/* ( name, globals ) -- * char * name; -- * struct sv_globals * globals; -- */ -+rle_delcom(char *name, struct sv_globals *globals); - - /* - * dither globals -diff -up xloadimage.4.1/rlelib.c.c23 xloadimage.4.1/rlelib.c ---- xloadimage.4.1/rlelib.c.c23 2025-02-24 15:41:17.678404514 -0500 -+++ xloadimage.4.1/rlelib.c 2025-02-24 15:41:17.688917387 -0500 -@@ -125,19 +125,43 @@ struct XtndRsetup - /* **************************************************************** - * Dispatch table for different output types. - */ --typedef void sv_fn(); -+static int sv_bg_color[3] = { 0, 0, 0 }; -+ -+struct sv_globals sv_globals = { -+ RUN_DISPATCH, /* dispatch value */ -+ 3, /* 3 colors */ -+ sv_bg_color, /* background color */ -+ 0, /* (alpha) if 1, save alpha channel */ -+ 2, /* (background) 0->just save pixels, */ -+ /* 1->overlay, 2->clear to bg first */ -+ 0, 511, /* (xmin, xmax) X bounds to save */ -+ 0, 479, /* (ymin, ymax) Y bounds to save */ -+ 0, /* ncmap (if != 0, save color map) */ -+ 8, /* cmaplen (log2 of length of color map) */ -+ NULL, /* pointer to color map */ -+ NULL, /* pointer to comment strings */ -+ NULL, /* output file */ -+ { 7 } /* RGB channels only */ -+ /* Can't initialize the union */ -+}; -+ -+typedef void sv_r1_fn(struct sv_globals *); -+typedef void sv_r2_fn(int, struct sv_globals *); -+typedef void sv_r3_fn(int, int, int, struct sv_globals *); -+typedef void sv_r4_fn(rle_pixel *, int, struct sv_globals *); -+ - struct sv_dispatch_tab { -- char *magic; /* magic type flags */ -- sv_fn *setup, /* startup function */ -- *skipBlankLines, -- *setColor, -- *skipPixels, -- *newScanLine, -- *putdat, /* put a set of differing pixels */ -- *putrn, /* put a run all the same */ -- *blockHook, /* hook called at start of new */ -- /* output block */ -- *putEof; /* write EOF marker (if possible) */ -+ char *magic; /* magic type flags */ -+ sv_r1_fn *setup; /* startup function */ -+ sv_r2_fn *skipBlankLines; -+ sv_r2_fn *setColor; -+ sv_r3_fn *skipPixels; -+ sv_r2_fn *newScanLine; -+ sv_r4_fn *putdat; /* put a set of differing pixels */ -+ sv_r3_fn *putrn; /* put a run all the same */ -+ sv_r1_fn *blockHook; /* hook called at start of new */ -+ /* output block */ -+ sv_r1_fn *putEof; /* write EOF marker (if possible) */ - }; - - /* -@@ -198,17 +222,17 @@ struct sv_dispatch_tab { - */ - - --void RunSetup(), -- RunSkipBlankLines(), -- RunSetColor(), -- RunSkipPixels(), -- RunNewScanLine(), -- Runputdata(), -- Runputrun(), -- RunputEof(); -+void RunSetup(struct sv_globals *), -+ RunSkipBlankLines(int, struct sv_globals *), -+ RunSetColor(int, struct sv_globals *), -+ RunSkipPixels(int, int, int, struct sv_globals *), -+ RunNewScanLine(int, struct sv_globals *), -+ Runputdata(rle_pixel *, int, struct sv_globals *), -+ Runputrun(int, int, int, struct sv_globals *), -+ RunputEof(struct sv_globals *); - --void DefaultBlockHook(); --void NullputEof(); -+void DefaultBlockHook(struct sv_globals *); -+void NullputEof(struct sv_globals *); - - struct sv_dispatch_tab sv_DTable[10] = { - { -@@ -225,30 +249,9 @@ struct sv_dispatch_tab sv_DTable[10] = { - }, - }; - --static int sv_bg_color[3] = { 0, 0, 0 }; -- --struct sv_globals sv_globals = { -- RUN_DISPATCH, /* dispatch value */ -- 3, /* 3 colors */ -- sv_bg_color, /* background color */ -- 0, /* (alpha) if 1, save alpha channel */ -- 2, /* (background) 0->just save pixels, */ -- /* 1->overlay, 2->clear to bg first */ -- 0, 511, /* (xmin, xmax) X bounds to save */ -- 0, 479, /* (ymin, ymax) Y bounds to save */ -- 0, /* ncmap (if != 0, save color map) */ -- 8, /* cmaplen (log2 of length of color map) */ -- NULL, /* pointer to color map */ -- NULL, /* pointer to comment strings */ -- NULL, /* output file */ -- { 7 } /* RGB channels only */ -- /* Can't initialize the union */ --}; -- - /* ARGSUSED */ - void --NullputEof(globals) --struct sv_globals * globals; -+NullputEof(struct sv_globals *globals) - { - /* do nothing */ - } -@@ -413,8 +416,7 @@ union { short s; char c[2]; } arg; - * Put out initial setup data for RLE svfb files. - */ - void --RunSetup(globals) --register struct sv_globals * globals; -+RunSetup(struct sv_globals *globals) - { - } - -@@ -423,9 +425,7 @@ register struct sv_globals * globals; - * Skip one or more blank lines in the RLE file. - */ - void --RunSkipBlankLines(nblank, globals) --int nblank; --register struct sv_globals * globals; -+RunSkipBlankLines(int nblank, register struct sv_globals *globals) - { - } - -@@ -435,9 +435,7 @@ register struct sv_globals * globals; - * color: 0 = Red, 1 = Green, 2 = Blue. - */ - void --RunSetColor(c, globals) --int c; --register struct sv_globals * globals; -+RunSetColor(int c, register struct sv_globals *globals) - { - } - -@@ -448,9 +446,7 @@ register struct sv_globals * globals; - - /* ARGSUSED */ - void --RunSkipPixels(nskip, last, wasrun, globals) --int nskip, last, wasrun; --register struct sv_globals * globals; -+RunSkipPixels(int nskip, int last, int wasrun, register struct sv_globals *globals) - { - } - -@@ -460,9 +456,7 @@ register struct sv_globals * globals; - * operation, only generate code if the newline flag is true. - */ - void --RunNewScanLine(flag, globals) --int flag; --register struct sv_globals * globals; -+RunNewScanLine(int flag, register struct sv_globals *globals) - { - } - -@@ -471,10 +465,7 @@ register struct sv_globals * globals; - * Put one or more pixels of byte data into the output file. - */ - void --Runputdata(buf, n, globals) --rle_pixel * buf; --int n; --register struct sv_globals * globals; -+Runputdata(rle_pixel *buf, int n, register struct sv_globals *globals) - { - } - -@@ -485,9 +476,7 @@ register struct sv_globals * globals; - - /* ARGSUSED */ - void --Runputrun(color, n, last, globals) --int color, n, last; --register struct sv_globals * globals; -+Runputrun(int color, int n, int last, register struct sv_globals *globals) - { - } - -@@ -497,15 +486,13 @@ register struct sv_globals * globals; - * Output an EOF opcode - */ - void --RunputEof( globals ) --register struct sv_globals * globals; -+RunputEof( register struct sv_globals *globals ) - { - } - - /*ARGSUSED*/ - void --DefaultBlockHook(globals) --struct sv_globals * globals; -+DefaultBlockHook(struct sv_globals *globals) - { - } - -@@ -560,10 +547,7 @@ struct sv_globals * globals; - * be addressed by an rle_pixel). - */ - rle_pixel ** --buildmap( globals, minmap, gamma ) --struct sv_globals *globals; --int minmap; --double gamma; -+buildmap( struct sv_globals *globals, int minmap, double gamma ) - { - rle_pixel ** cmap, * gammap; - register int i, j; -@@ -710,9 +694,7 @@ double gamma; - * [None] - */ - static char * --match( n, v ) --register char *n; --register char *v; -+match( register char *n, register char *v ) - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -@@ -741,9 +723,7 @@ register char *v; - * [None] - */ - char * --rle_getcom( name, globals ) --char *name; --struct sv_globals *globals; -+rle_getcom( char *name, struct sv_globals *globals ) - { - char ** cp; - char * v; -@@ -806,7 +786,7 @@ struct inst { - #define DATUM(inst) (0x00ff & inst.datum) - - static int debug_f; /* if non-zero, print debug info */ --static void bfill(); -+static void bfill(char *, int, int); - - /***************************************************************** - * TAG( rle_get_setup ) -@@ -827,8 +807,7 @@ static void bfill(); - * Algorithm: - * Read in the setup info and fill in sv_globals. - */ --int rle_get_setup( globals ) --struct sv_globals * globals; -+int rle_get_setup( struct sv_globals *globals ) - { - struct XtndRsetup setup; - short magic; /* assume 16 bits */ -@@ -987,10 +966,7 @@ struct sv_globals * globals; - * Returns code. - */ - --int rle_get_error( code, pgmname, fname ) --int code; --char *pgmname; --char *fname; -+int rle_get_error( int code, char *pgmname, char *fname ) - { - switch( code ) - { -@@ -1045,10 +1021,7 @@ char *fname; - * sv_get_setup does all the work. - */ - void --rle_get_setup_ok( globals, prog_name, file_name ) --struct sv_globals * globals; --char *prog_name; --char *file_name; -+rle_get_setup_ok( struct sv_globals *globals, char *prog_name, char *file_name ) - { - int code; - -@@ -1075,8 +1048,7 @@ char *file_name; - * [None] - */ - void --rle_debug( on_off ) --int on_off; -+rle_debug( int on_off ) - { - debug_f = on_off; - } -@@ -1107,9 +1079,7 @@ int on_off; - * decoding the instructions into scanline data. - */ - --int rle_getrow( globals, scanline ) --struct sv_globals * globals; --rle_pixel *scanline[]; -+int rle_getrow( struct sv_globals *globals, rle_pixel *scanline[] ) - { - register rle_pixel * scanc; - register int nc; -@@ -1299,9 +1269,7 @@ rle_pixel *scanline[]; - - /* Fill buffer at s with n copies of character c. N must be <= 65535*/ - /* ARGSUSED */ --static void bfill( s, n, c ) --char *s; --int n, c; -+static void bfill( char *s, int n, int c ) - { - #if defined(vax) && !defined(VMS) - asm(" movc5 $0,*4(ap),12(ap),8(ap),*4(ap)"); -@@ -1353,7 +1321,7 @@ int n, c; - * Copyright (c) 1987, University of Utah - */ - --void make_square(); -+void make_square(double, int *, int *, int (*)[16]); - - /* dither globals */ - int dith_levels = 128; -@@ -1392,13 +1360,7 @@ int dith_size = 16; - * if you don't want function call overhead. - */ - void --dithermap( levels, gamma, rgbmap, divN, modN, magic ) --int levels; --double gamma; --int rgbmap[][3]; --int divN[256]; --int modN[256]; --int magic[16][16]; -+dithermap( int levels, double gamma, int rgbmap[][3], int divN[256], int modN[256], int magic[16][16] ) - { - double N; - register int i; -@@ -1453,13 +1415,7 @@ int magic[16][16]; - * divN[val] > magic[col][row] ? 1 : 0 - */ - void --bwdithermap( levels, gamma, bwmap, divN, modN, magic ) --int levels; --double gamma; --int bwmap[]; --int divN[256]; --int modN[256]; --int magic[16][16]; -+bwdithermap( int levels, double gamma, int bwmap[], int divN[256], int modN[256], int magic[16][16] ) - { - double N; - register int i; -@@ -1500,11 +1456,7 @@ int magic[16][16]; - * its sublevel, and is used in the dithering computation. - */ - void --make_square( N, divN, modN, magic ) --double N; --int divN[256]; --int modN[256]; --int magic[16][16] ; -+make_square( double N, int divN[256], int modN[256], int magic[16][16] ) - { - register int i, j, k, l; - double magicfact; -@@ -1596,9 +1548,7 @@ int magic16x16[16][16] = - * Algorithm: - * Chose sub cell of 16 by 16 magic square - */ --void make_magic( size, magic ) --int size; --int magic[16][16]; -+void make_magic( int size, int magic[16][16] ) - { - int j,i,li,bi,bx,by; - int xx,yy; -@@ -1640,9 +1590,7 @@ int magic[16][16]; - * Outputs: - * Changes gamma array entries. - */ --void make_gamma( gamma, gammamap ) --double gamma; --int gammamap[256]; -+void make_gamma( double gamma, int gammamap[256] ) - { - register int i; - -@@ -1677,11 +1625,7 @@ int gammamap[256]; - * Algorithm: - * see "Note:" in dithermap comment. - */ --int dithergb( x, y, r, g, b, levels, divN, modN, magic ) --int x, y, r, g, b, levels; --int divN[256]; --int modN[256]; --int magic[16][16]; -+int dithergb( int x, int y, int r, int g, int b, int levels, int divN[256], int modN[256], int magic[16][16] ) - { - int col = x % 16, row = y % 16; - -@@ -1708,11 +1652,7 @@ int magic[16][16]; - * Algorithm: - * see "Note:" in bwdithermap comment. - */ --int ditherbw( x, y, val, divN, modN, magic ) --int x, y, val; --int divN[256]; --int modN[256]; --int magic[16][16]; -+int ditherbw( int x, int y, int val, int divN[256], int modN[256], int magic[16][16] ) - { - int col = x % 16, row = y % 16; - -diff -up xloadimage.4.1/root.c.c23 xloadimage.4.1/root.c ---- xloadimage.4.1/root.c.c23 2025-02-24 15:41:17.667243127 -0500 -+++ xloadimage.4.1/root.c 2025-02-24 15:41:17.689062765 -0500 -@@ -23,9 +23,7 @@ - */ - - static void --preserveResource(dpy, w) -- Display *dpy; -- Window w; -+preserveResource(Display *dpy, Window w) - { - /* create dummy resource */ - Pixmap pm= XCreatePixmap(dpy, w, 1, 1, 1); -@@ -49,10 +47,7 @@ preserveResource(dpy, w) - */ - - static void --freePrevious(dpy, w, verbose) -- Display *dpy; -- Window w; -- unsigned int verbose; -+freePrevious(Display *dpy, Window w, unsigned int verbose) - { - Pixmap *pm; - unsigned char *charpm; -@@ -114,9 +109,7 @@ freePrevious(dpy, w, verbose) - * out of xsetroot with minor formatting changes. - */ - --static Window getWmRootWindow(dpy, root) -- Display *dpy; -- Window root; -+static Window getWmRootWindow(Display *dpy, Window root) - { - Window parent; - Window *child; -@@ -140,9 +133,7 @@ static Window getWmRootWindow(dpy, root) - return((Window)0); - } - --static Window getDECRootWindow(dpy, root) -- Display *dpy; -- Window root; -+static Window getDECRootWindow(Display *dpy, Window root) - { - Window temporary_rootW; - -@@ -155,12 +146,7 @@ static Window getDECRootWindow(dpy, root - } - #endif /* FIND_DEC_ROOTWINDOW */ - --void imageOnRoot(disp, scrn, image, options, verbose) -- Display *disp; -- int scrn; -- Image *image; -- OptionSet *options; -- unsigned int verbose; -+void imageOnRoot(Display *disp, int scrn, Image *image, OptionSet *options, unsigned int verbose) - { Option *opt; - Pixmap pixmap; - XImageInfo *ximageinfo; -diff -up xloadimage.4.1/rotate.c.c23 xloadimage.4.1/rotate.c ---- xloadimage.4.1/rotate.c.c23 2025-02-24 15:41:17.664195359 -0500 -+++ xloadimage.4.1/rotate.c 2025-02-24 15:41:17.689122344 -0500 -@@ -10,14 +10,15 @@ - - /* rotate_bitmap() - * converts an old bitmap bit position into a new one -+ * -+ * int num; Source byte number -+ * int pos; Source bit position -+ * int width; Width of source bitmap -+ * int height; Height of source bitmap -+ * int *new_num; Destination byte number -+ * int *new_pos; Destination bit position - */ --void rotate_bitmap(num, pos, width, height, new_num, new_pos) --int num; /* Source byte number */ --int pos; /* Source bit position */ --int width; /* Width of source bitmap */ --int height; /* Height of source bitmap */ --int *new_num; /* Destination byte number */ --int *new_pos; /* Destination bit position */ -+void rotate_bitmap(int num, int pos, int width, int height, int *new_num, int *new_pos) - { - int slen; /* Length of source line */ - int dlen; /* Length of destination line */ -@@ -36,11 +37,11 @@ int *new_pos; /* Destination bit posi - - /* rotate() - * rotates an image -+ * Image *simage; Image to rotate -+ * unsigned int degrees; Number of degrees to rotate -+ * unsigned int verbose; - */ --Image *rotate(simage, degrees, verbose) --Image *simage; /* Image to rotate */ --unsigned int degrees; /* Number of degrees to rotate */ --unsigned int verbose; -+Image *rotate(Image *simage, unsigned int degrees, unsigned int verbose) - { - char buf[BUFSIZ]; /* New title */ - Image *image1; /* Source image */ -diff -up xloadimage.4.1/send.c.c23 xloadimage.4.1/send.c ---- xloadimage.4.1/send.c.c23 2025-02-24 15:41:17.649114385 -0500 -+++ xloadimage.4.1/send.c 2025-02-24 15:41:17.689193520 -0500 -@@ -13,9 +13,7 @@ - - static int GotError; - --static int pixmapErrorTrap(disp, pErrorEvent) -- Display *disp; -- XErrorEvent * pErrorEvent; -+static int pixmapErrorTrap(Display *disp, XErrorEvent *pErrorEvent) - { - #define MAXERRORLEN 100 - char buf[MAXERRORLEN+1]; -@@ -28,12 +26,9 @@ static int pixmapErrorTrap(disp, pErrorE - return(0); - } - --Pixmap ximageToPixmap(disp, parent, ximageinfo) -- Display *disp; -- Window parent; -- XImageInfo *ximageinfo; -+Pixmap ximageToPixmap(Display *disp, Window parent, XImageInfo *ximageinfo) - { -- int (*old_handler)(); -+ int (*old_handler)(Display *, XErrorEvent *); - Pixmap pixmap; - - GotError = 0; -@@ -58,10 +53,7 @@ Pixmap ximageToPixmap(disp, parent, xima - * by looking at the structure ourselves. - */ - --static unsigned int bitsPerPixelAtDepth(disp, scrn, depth) -- Display *disp; -- int scrn; -- unsigned int depth; -+static unsigned int bitsPerPixelAtDepth(Display *disp, int scrn, unsigned int depth) - { - #if XlibSpecificationRelease < 4 /* the way things were */ - unsigned int a; -@@ -87,16 +79,8 @@ static unsigned int bitsPerPixelAtDepth( - exit(1); - } - --XImageInfo *imageToXImage(disp, scrn, visual, ddepth, image, private_cmap, fit, -- verbose) -- Display *disp; -- int scrn; -- Visual *visual; /* visual to use */ -- unsigned int ddepth; /* depth of the visual to use */ -- Image *image; -- unsigned int private_cmap; -- unsigned int fit; -- unsigned int verbose; -+XImageInfo *imageToXImage(Display *disp, int scrn, Visual *visual, unsigned int ddepth, Image *image, unsigned int private_cmap, unsigned int fit, -+ unsigned int verbose) - { Pixel *index, *redvalue, *greenvalue, *bluevalue; - unsigned int a, b, newmap, x, y, linelen, dpixlen, dbits; - XColor xcolor; -@@ -600,10 +584,7 @@ imageToXImage: XAllocColor failed on a T - * to the drawable. - */ - --void sendXImage(ximageinfo, src_x, src_y, dst_x, dst_y, w, h) -- XImageInfo *ximageinfo; -- int src_x, src_y, dst_x, dst_y; -- unsigned int w, h; -+void sendXImage(XImageInfo *ximageinfo, int src_x, int src_y, int dst_x, int dst_y, unsigned int w, unsigned int h) - { XGCValues gcv; - - /* build and cache the GC -@@ -630,9 +611,7 @@ void sendXImage(ximageinfo, src_x, src_y - /* free up anything cached in the local Ximage structure. - */ - --void freeXImage(image, ximageinfo) -- Image *image; -- XImageInfo *ximageinfo; -+void freeXImage(Image *image, XImageInfo *ximageinfo) - { - if (ximageinfo->gc) - XFreeGC(ximageinfo->disp, ximageinfo->gc); -diff -up xloadimage.4.1/smooth.c.c23 xloadimage.4.1/smooth.c ---- xloadimage.4.1/smooth.c.c23 2025-02-24 15:44:28.586923256 -0500 -+++ xloadimage.4.1/smooth.c 2025-02-24 15:44:52.920079717 -0500 -@@ -11,8 +11,7 @@ - #include "copyright.h" - #include "image.h" - --static Image *doSmooth(image) -- Image *image; -+static Image *doSmooth(Image *image) - { Image *old, *new; - int x, y, x1, y1, linelen; - int xindex[3]; -@@ -72,10 +71,7 @@ static Image *doSmooth(image) - return(new); - } - --Image *smooth(image, iterations, verbose) -- Image *image; -- int iterations; -- unsigned int verbose; -+Image *smooth(Image *image, int iterations, unsigned int verbose) - { int a; - Image *old, *new; - -diff -up xloadimage.4.1/sunraster.c.c23 xloadimage.4.1/sunraster.c ---- xloadimage.4.1/sunraster.c.c23 2025-02-24 15:42:55.454023774 -0500 -+++ xloadimage.4.1/sunraster.c 2025-02-24 15:44:21.566453997 -0500 -@@ -15,9 +15,7 @@ - /* SUPPRESS 558 */ - /* SUPPRESS 560 */ - --static void babble(name, header) -- char *name; -- struct rheader *header; -+static void babble(char *name, struct rheader *header) - { - printf("%s is a", name); - switch (memToVal(header->type, 4)) { -@@ -66,8 +64,7 @@ static void babble(name, header) - printf(" Sun rasterfile\n"); - } - --int sunRasterIdent(fullname, name) -- char *fullname, *name; -+int sunRasterIdent(char *fullname, char *name) - { ZFILE *zf; - struct rheader header; - int r; -@@ -100,13 +97,10 @@ int sunRasterIdent(fullname, name) - } - - /* read either rl-encoded or normal image data -+* enc is true if encoded file - */ - --static void sunread(zf, buf, len, enc) -- ZFILE *zf; -- byte *buf; -- unsigned int len; -- unsigned int enc; /* true if encoded file */ -+static void sunread(ZFILE *zf, byte *buf, unsigned int len, unsigned int enc) - { static byte repchar, remaining= 0; - - /* rl-encoded read -@@ -154,9 +148,7 @@ static void sunread(zf, buf, len, enc) - } - } - --Image *sunRasterLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *sunRasterLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - struct rheader header; - unsigned int mapsize; -diff -up xloadimage.4.1/tiff.c.c23 xloadimage.4.1/tiff.c ---- xloadimage.4.1/tiff.c.c23 2025-02-24 15:41:17.678617195 -0500 -+++ xloadimage.4.1/tiff.c 2025-02-24 15:41:17.689271622 -0500 -@@ -28,10 +28,7 @@ struct tiff_info { - char *title; - }; - --static TIFF *is_tiff(fullname, name, info) -- char *fullname; -- char *name; -- struct tiff_info *info; -+static TIFF *is_tiff(char *fullname, char *name, struct tiff_info *info) - { - ZFILE *zf; - TIFFHeaderClassic th; -@@ -117,8 +114,7 @@ static TIFF *is_tiff(fullname, name, inf - return(0); - } - --static char *photometricName(info) -- struct tiff_info *info; -+static char *photometricName(struct tiff_info *info) - { - static char buf[32]; - -@@ -154,8 +150,7 @@ static char *photometricName(info) - } - } - --static char *compressionName(compression) -- int compression; -+static char *compressionName(int compression) - { - switch (compression) { - case COMPRESSION_NONE: -@@ -183,8 +178,7 @@ static char *compressionName(compression - } - } - --static char *planarConfigName(config) -- int config; -+static char *planarConfigName(int config) - { - switch (config) { - case PLANARCONFIG_CONTIG: -@@ -196,9 +190,7 @@ static char *planarConfigName(config) - } - } - --static void babble(name, info) -- char *name; -- struct tiff_info *info; -+static void babble(char *name, struct tiff_info *info) - { - switch (info->photometric) { - case PHOTOMETRIC_MINISWHITE: -@@ -222,9 +214,7 @@ static void babble(name, info) - printf("\n"); - } - --int tiffIdent(fullname, name) --char *fullname; --char *name; -+int tiffIdent(char *fullname, char *name) - { - TIFF *tiff; - struct tiff_info info; -@@ -241,10 +231,7 @@ char *name; - return(1); - } - --Image *tiffLoad(fullname, name, verbose) -- char *fullname; -- char *name; -- int verbose; -+Image *tiffLoad(char *fullname, char *name, unsigned int verbose) - { - TIFF *tiff; - struct tiff_info info; -@@ -467,11 +454,7 @@ Image *tiffLoad(fullname, name, verbose) - /* this is not what I'd call a well-designed TIFF dumping function but it - * does do the job. - */ --void tiffDump(image, options, file, verbose) -- Image *image; -- char *options; -- char *file; -- int verbose; -+void tiffDump(Image *image, char *options, char *file, int verbose) - { - TIFF *out; - char *name, *value; -diff -up xloadimage.4.1/undither.c.c23 xloadimage.4.1/undither.c ---- xloadimage.4.1/undither.c.c23 1993-10-21 17:28:42.000000000 -0400 -+++ xloadimage.4.1/undither.c 2025-02-24 15:41:17.689343143 -0500 -@@ -7,9 +7,7 @@ - - #include "image.h" - --Image *undither(oimage, verbose) -- Image *oimage; -- unsigned int verbose; -+Image *undither(Image *oimage, unsigned int verbose) - { - Image *nimage; /* new image to build */ - byte *optr, *nptr; /* Ptr into old/new data */ -diff -up xloadimage.4.1/uufilter.c.c23 xloadimage.4.1/uufilter.c ---- xloadimage.4.1/uufilter.c.c23 2025-02-24 15:41:27.132444513 -0500 -+++ xloadimage.4.1/uufilter.c 2025-02-24 15:41:47.467876786 -0500 -@@ -14,9 +14,7 @@ - #include - #include - --int main(argc, argv) -- int argc; -- char **argv; -+int main(int argc, char **argv) - { - FILE *inf, *outf; - char *infilename = NULL; -diff -up xloadimage.4.1/value.c.c23 xloadimage.4.1/value.c ---- xloadimage.4.1/value.c.c23 1993-10-21 17:28:43.000000000 -0400 -+++ xloadimage.4.1/value.c 2025-02-24 15:41:17.689396647 -0500 -@@ -13,9 +13,7 @@ - #include "copyright.h" - #include "image.h" - --unsigned long doMemToVal(p, len) -- byte *p; -- unsigned int len; -+unsigned long doMemToVal(byte *p, unsigned int len) - { unsigned int a; - unsigned long i; - -@@ -25,10 +23,7 @@ unsigned long doMemToVal(p, len) - return(i); - } - --unsigned long doValToMem(val, p, len) -- unsigned long val; -- byte *p; -- unsigned int len; -+unsigned long doValToMem(unsigned long val, byte *p, unsigned int len) - { int a; - - for (a= len - 1; a >= 0; a--) { -@@ -38,9 +33,7 @@ unsigned long doValToMem(val, p, len) - return(val); - } - --unsigned long doMemToValLSB(p, len) -- byte *p; -- unsigned int len; -+unsigned long doMemToValLSB(byte *p, unsigned int len) - { int val, a; - - val= 0; -@@ -52,10 +45,7 @@ unsigned long doMemToValLSB(p, len) - /* this is provided for orthagonality - */ - --unsigned long doValToMemLSB(val, p, len) -- byte *p; -- unsigned long val; -- unsigned int len; -+unsigned long doValToMemLSB(unsigned long val, byte *p, unsigned int len) - { - while (len--) { - *(p++)= val & 0xff; -@@ -67,9 +57,7 @@ unsigned long doValToMemLSB(val, p, len) - /* this flips all the bits in a byte array at byte intervals - */ - --void flipBits(p, len) -- byte *p; -- unsigned int len; -+void flipBits(byte *p, unsigned int len) - { static int init= 0; - static byte flipped[256]; - -diff -up xloadimage.4.1/vff.c.c23 xloadimage.4.1/vff.c ---- xloadimage.4.1/vff.c.c23 2025-02-24 15:41:17.649800142 -0500 -+++ xloadimage.4.1/vff.c 2025-02-24 15:41:17.689455021 -0500 -@@ -39,16 +39,14 @@ static char *header[MAX_HEAD_LINES]; - static int width, height, bands, cmsize; - static unsigned char rm[256], gm[256], bm[256]; - --static int readHeader(); -+static int readHeader(ZFILE *); - static int parseHeader(); --static int readImage(); -+static int readImage(ZFILE *, Image *); - static void freeheader(); - - - Image * --vffLoad(fullname, name, verbose) --char *fullname, *name; --unsigned int verbose; -+vffLoad(char *fullname, char *name, unsigned int verbose) - { - - ZFILE *zf; -@@ -109,9 +107,7 @@ unsigned int verbose; - } - - static int --readImage(zf, image) --ZFILE *zf; --Image *image; -+readImage(ZFILE *zf, Image *image) - { - byte *buf; - byte *op, *ip; -@@ -252,8 +248,7 @@ freeheader() - } - - static int --readHeader(zf) --ZFILE *zf; -+readHeader(ZFILE *zf) - { - char buf[HEAD_BUF_SIZE]; - int count, c, lines; -@@ -361,8 +356,7 @@ ZFILE *zf; - return(0); /* so that we try and see what was wrong */ - } - --int vffIdent(fullname, name) --char *fullname, *name; -+int vffIdent(char *fullname, char *name) - { - - ZFILE *zf; -diff -up xloadimage.4.1/vicar.c.c23 xloadimage.4.1/vicar.c ---- xloadimage.4.1/vicar.c.c23 2025-02-24 15:41:17.649944407 -0500 -+++ xloadimage.4.1/vicar.c 2025-02-24 15:41:17.689526442 -0500 -@@ -15,7 +15,7 @@ - #include "image.h" - #include - --FILE *fp,*fopen(); -+FILE *fp,*fopen(const char * restrict, const char * restrict); - int label[10]; - char labstr[80]; - int flag=0; -@@ -31,8 +31,7 @@ int flag=0; - ** - */ - --unsigned int vicarIdent (fullname, name) -- char *fullname, *name; -+unsigned int vicarIdent (char *fullname, char *name) - { - int i=0; - char IDENT[7]; -@@ -69,8 +68,7 @@ unsigned int vicarIdent (fullname, name) - - /* vicHeader - print the history record */ - --static void vicarHeader(ptr) -- char *ptr; -+static void vicarHeader(char *ptr) - { - int i; - int prflag; -@@ -103,9 +101,7 @@ static void vicarHeader(ptr) - ** - */ - --Image *vicarLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *vicarLoad(char *fullname, char *name, unsigned int verbose) - { - int i; - unsigned int mapsize, size; -@@ -115,7 +111,7 @@ Image *vicarLoad(fullname, name, verbose - byte *mapred,*mapgreen,*mapblue; - ZFILE *zf; - -- if ( vicarIdent(fullname,name,verbose) == 0 ) -+ if ( vicarIdent(fullname,name) == 0 ) - return(0); - - /* define the image structure */ -diff -up xloadimage.4.1/window.c.c23 xloadimage.4.1/window.c ---- xloadimage.4.1/window.c.c23 2025-02-24 15:41:17.677166842 -0500 -+++ xloadimage.4.1/window.c 2025-02-24 15:41:17.689603409 -0500 -@@ -40,7 +40,7 @@ static Colormap ImageColormap; - #ifdef ENABLE_TIMEOUT - static int AlarmWentOff = 0; - --static void delayAlarmHandler() -+static void delayAlarmHandler(int AlarmWentOff) - { - AlarmWentOff = 1; - } -@@ -53,9 +53,7 @@ static void delayAlarmHandler() - * - mfc 90/10/08 - */ - --static int getNextEventWithTimeout(disp, event) -- Display *disp; -- XEvent *event; -+static int getNextEventWithTimeout(Display *disp, XEvent *event) - { - #ifdef HAS_POLL - struct pollfd fds[1]; -@@ -95,12 +93,7 @@ static int getNextEventWithTimeout(disp, - } - #endif /* ENABLE_TIMEOUT */ - --static void setCursor(disp, window, iw, ih, ww, wh, cursor) -- Display *disp; -- Window window; -- unsigned int iw, ih; -- unsigned int ww, wh; -- Cursor *cursor; -+static void setCursor(Display *disp, Window window, unsigned int iw, unsigned int ih, unsigned int ww, unsigned int wh, Cursor *cursor) - { XSetWindowAttributes swa; - - if ((ww >= iw) && (wh >= ih)) -@@ -119,10 +112,7 @@ static void setCursor(disp, window, iw, - /* place an image - */ - --static void placeImage(disp, width, height, winwidth, winheight, rx, ry) -- Display *disp; -- int width, height, winwidth, winheight; -- int *rx, *ry; /* supplied and returned */ -+static void placeImage(Display *disp, int width, int height, int winwidth, int winheight, int *rx, int *ry) - { int pixx, pixy; - - pixx= *rx; -@@ -152,11 +142,8 @@ static void placeImage(disp, width, heig - /* blit an image - */ - --static void blitImage(ximageinfo, width, height, -- x, y, w, h) -- XImageInfo *ximageinfo; -- unsigned int width, height; -- int x, y, w, h; -+static void blitImage(XImageInfo *ximageinfo, unsigned int width, unsigned int height, -+ int x, int y, int w, int h) - { - if (w > width) - w= width; -@@ -188,8 +175,7 @@ static void blitImage(ximageinfo, width, - /* clean up static window if we're through with it - */ - --void cleanUpWindow(disp) -- Display *disp; -+void cleanUpWindow(Display *disp) - { - if (ImageWindow) - XDestroyWindow(disp, ImageWindow); -@@ -202,13 +188,7 @@ void cleanUpWindow(disp) - /* clean up after displaying an image - */ - --static void cleanUpImage(disp, scrn, cursor, pixmap, image, ximageinfo) -- Display *disp; -- int scrn; -- Cursor cursor; -- Pixmap pixmap; -- Image *image; -- XImageInfo *ximageinfo; -+static void cleanUpImage(Display *disp, int scrn, Cursor cursor, Pixmap pixmap, Image *image, XImageInfo *ximageinfo) - { - XFreeCursor(disp, cursor); - if (pixmap != None) -@@ -220,10 +200,7 @@ static void cleanUpImage(disp, scrn, cur - * viewport. - */ - --void setViewportColormap(disp, scrn, visual) -- Display *disp; -- int scrn; -- Visual *visual; -+void setViewportColormap(Display *disp, int scrn, Visual *visual) - { XSetWindowAttributes swa; - static Atom cmap_atom= None; - Window cmap_windows[2]; -@@ -259,8 +236,7 @@ void setViewportColormap(disp, scrn, vis - /* this attempts to convert an image title into a reasonable icon name - */ - --static char *iconName(s) -- char *s; -+static char *iconName(char *s) - { static char buf[BUFSIZ]; - char *t; - -@@ -304,8 +280,7 @@ static struct visual_class_name { - {-1, NULL} - }; - --int visualClassFromName(name) -- char *name; -+int visualClassFromName(char *name) - { int a; - char *s1, *s2; - int class= -1; -@@ -334,8 +309,7 @@ int visualClassFromName(name) - return(class); - } - --char *nameOfVisualClass(class) -- int class; -+char *nameOfVisualClass(int class) - { int a; - - for (a= 0; VisualClassName[a].name; a++) -@@ -347,11 +321,7 @@ char *nameOfVisualClass(class) - /* find the best visual of a particular class with a particular depth - */ - --static Visual *bestVisualOfClassAndDepth(disp, scrn, class, depth) -- Display *disp; -- int scrn; -- int class; -- unsigned int depth; -+static Visual *bestVisualOfClassAndDepth(Display *disp, int scrn, int class, unsigned int depth) - { Visual *best= NULL; - XVisualInfo template, *info; - int nvisuals; -@@ -376,12 +346,7 @@ static Visual *bestVisualOfClassAndDepth - * image - */ - --static void bestVisual(disp, scrn, image, rvisual, rdepth) -- Display *disp; -- int scrn; -- Image *image; -- Visual **rvisual; -- unsigned int *rdepth; -+static void bestVisual(Display *disp, int scrn, Image *image, Visual **rvisual, unsigned int *rdepth) - { unsigned int depth, a; - Screen *screen; - Visual *visual, *default_visual; -@@ -492,13 +457,7 @@ static void bestVisual(disp, scrn, image - * any visual of that type at any depth - */ - --void bestVisualOfClass(disp, scrn, image, visual_class, rvisual, rdepth) -- Display *disp; -- int scrn; -- Image *image; -- int visual_class; -- Visual **rvisual; -- unsigned int *rdepth; -+void bestVisualOfClass(Display *disp, int scrn, Image *image, int visual_class, Visual **rvisual, unsigned int *rdepth) - { - Visual *visual; - Screen *screen; -@@ -527,16 +486,8 @@ void bestVisualOfClass(disp, scrn, image - *rdepth= depth; - } - --char imageInWindow(disp, scrn, image, global_options, image_options, -- argc, argv, verbose) -- Display *disp; -- int scrn; -- Image *image; -- OptionSet *global_options; -- OptionSet *image_options; -- int argc; -- char *argv[]; -- unsigned int verbose; -+char imageInWindow(Display *disp, int scrn, Image *image, OptionSet *global_options, OptionSet *image_options, -+ int argc, char *argv[], unsigned int verbose) - { Pixmap pixmap = None; - XImageInfo *ximageinfo; - Visual *visual; -diff -up xloadimage.4.1/xbitmap.c.c23 xloadimage.4.1/xbitmap.c ---- xloadimage.4.1/xbitmap.c.c23 2025-02-24 15:41:17.650216402 -0500 -+++ xloadimage.4.1/xbitmap.c 2025-02-24 15:41:17.689695164 -0500 -@@ -84,8 +84,7 @@ static void initHexTable() - /* read a hex value and return its value - */ - --static int nextInt(zf) -- ZFILE *zf; -+static int nextInt(ZFILE *zf) - { int c; - int value= 0; - int shift= 0; -@@ -116,16 +115,13 @@ static int nextInt(zf) - } - } - --static void badFile(name) -- char *name; -+static void badFile(char *name) - { - printf("%s: bad X bitmap file\n", name); - exit(1); - } - --Image *xbitmapLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *xbitmapLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - Image *image; - char line[MAX_SIZE]; -@@ -243,8 +239,7 @@ Image *xbitmapLoad(fullname, name, verbo - * x bitmaps anyway given their size - */ - --int xbitmapIdent(fullname, name) -- char *fullname, *name; -+int xbitmapIdent(char *fullname, char *name) - { Image *image; - - if ((image= xbitmapLoad(fullname, name, (unsigned int)1))) { -diff -up xloadimage.4.1/xloadimage.c.c23 xloadimage.4.1/xloadimage.c ---- xloadimage.4.1/xloadimage.c.c23 2025-02-24 15:41:17.682720468 -0500 -+++ xloadimage.4.1/xloadimage.c 2025-02-24 15:41:17.689765928 -0500 -@@ -43,10 +43,7 @@ static byte root_weave_bits[] = { - 0xe0, 0xb0, 0xd0, 0x70 - }; - --static Image *doProcessOnImage(image, option, verbose) -- Image *image; -- Option *option; -- int verbose; -+static Image *doProcessOnImage(Image *image, Option *option, int verbose) - { Image *retimage= image; - XColor xcolor; /* color for foreground/background */ - -@@ -134,10 +131,7 @@ static Image *doProcessOnImage(image, op - - /* process a list of options on an image - */ --static Image *processImage(image, global_options, image_options) -- Image *image; -- OptionSet *global_options; -- OptionSet *image_options; -+static Image *processImage(Image *image, OptionSet *global_options, OptionSet *image_options) - { Option *opt; - Image *tmpimage; - unsigned int verbose; -@@ -174,9 +168,7 @@ static Image *processImage(image, global - /* the real thing - */ - --int main(argc, argv) -- int argc; -- char *argv[]; -+int main(int argc, char *argv[]) - { Option *opt; - char *dname; - Image *dispimage; /* image that will be sent to the display */ -diff -up xloadimage.4.1/xloadimage.h.c23 xloadimage.4.1/xloadimage.h ---- xloadimage.4.1/xloadimage.h.c23 2025-02-24 15:41:17.650575504 -0500 -+++ xloadimage.4.1/xloadimage.h 2025-02-24 15:41:17.689830727 -0500 -@@ -38,35 +38,35 @@ typedef struct { - */ - - void supportedImageTypes(); /* imagetypes.c */ --void dumpImage(); -+void dumpImage(Image *, char *, char *, int); - --char *tail(); /* misc.c */ -+char *tail(char *); /* misc.c */ - void memoryExhausted(); --void internalError(); -+void internalError(int); - void version(); - void usage(); --void goodImage(); --int errorHandler(); -+void goodImage(Image *, char *); /* new.c */ -+int errorHandler(Display *, XErrorEvent *); /* misc.c */ - - void showConfiguration(); /* config.c */ - void listImages(); - --char *expandPath(); /* path.c */ --int findImage(); -+char *expandPath(char *); /* path.c */ -+int findImage(char *, char *); /* config.c */ - void listImages(); - void loadPathsAndExts(); - void showPath(); - --void imageOnRoot(); /* root.c */ -+void imageOnRoot(Display *, int, Image *, OptionSet *, unsigned int); /* root.c */ - --void sendXImage(); /* send.c */ --XImageInfo *imageToXImage(); --Pixmap ximageToPixmap(); --void freeXImage(); -+void sendXImage(XImageInfo *, int, int, int, int, unsigned int, unsigned int); /* send.c */ -+XImageInfo *imageToXImage(Display *, int, Visual *, unsigned int, Image *, unsigned int, unsigned int, unsigned int); -+Pixmap ximageToPixmap(Display *, Window, XImageInfo *); -+void freeXImage(Image *, XImageInfo *); - - Visual *getBestVisual(); /* visual.c */ - --int visualClassFromName(); /* window.c */ --char *nameOfVisualClass(); --void cleanUpWindow(); --char imageInWindow(); -+int visualClassFromName(char *); /* window.c */ -+char *nameOfVisualClass(int); -+void cleanUpWindow(Display *); -+char imageInWindow(Display *, int, Image *, OptionSet *, OptionSet *, int, char **, unsigned int); -diff -up xloadimage.4.1/xpixmap.c.c23 xloadimage.4.1/xpixmap.c ---- xloadimage.4.1/xpixmap.c.c23 2025-02-24 15:41:17.650662488 -0500 -+++ xloadimage.4.1/xpixmap.c 2025-02-24 15:41:17.689886418 -0500 -@@ -24,18 +24,14 @@ extern int Scrn; /* X screen number - - #define XPM_FORMAT 1 - --static void corrupted(fullname, zf) -- char *fullname; -- ZFILE *zf; -+static void corrupted(char *fullname, ZFILE *zf) - { - zclose(zf); - printf("%s: X Pixmap file is corrupted\n", fullname); - exit(1); - } - --Image *xpixmapLoad(fullname, name, verbose) -- char *fullname, *name; -- unsigned int verbose; -+Image *xpixmapLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - char buf[BUFSIZ]; - char what[BUFSIZ]; -@@ -232,8 +228,7 @@ Image *xpixmapLoad(fullname, name, verbo - return(image); - } - --int xpixmapIdent(fullname, name) -- char *fullname, *name; -+int xpixmapIdent(char *fullname, char *name) - { Image *image; - - if ((image= xpixmapLoad(fullname, name, (unsigned int)1))) { -diff -up xloadimage.4.1/xwd.c.c23 xloadimage.4.1/xwd.c ---- xloadimage.4.1/xwd.c.c23 2025-02-24 15:41:17.650805701 -0500 -+++ xloadimage.4.1/xwd.c 2025-02-24 15:41:17.689954529 -0500 -@@ -22,11 +22,7 @@ - * an XWD file. - */ - --static int isXWD(name, zf, header, verbose) -- char *name; -- ZFILE *zf; -- XWDHeader *header; -- int verbose; -+static int isXWD(char *name, ZFILE *zf, XWDHeader *header, int verbose) - { GenericXWDHeader gh; - int a; - -@@ -132,8 +128,7 @@ static int isXWD(name, zf, header, verbo - return(1); - } - --int xwdIdent(fullname, name) -- char *fullname, *name; -+int xwdIdent(char *fullname, char *name) - { ZFILE *zf; - XWDHeader header; - int ret; -@@ -145,10 +140,7 @@ int xwdIdent(fullname, name) - return(ret); - } - --static Image *loadXYBitmap(fullname, zf, header) -- char *fullname; -- ZFILE *zf; -- XWDHeader header; -+static Image *loadXYBitmap(char *fullname, ZFILE *zf, XWDHeader header) - { Image *image; - int dlinelen; /* length of scan line in data file */ - int ilinelen; /* length of line within image structure */ -@@ -160,7 +152,7 @@ static Image *loadXYBitmap(fullname, zf, - int x, y; /* horizontal and vertical counters */ - byte *line; /* input scan line */ - byte *dptr, *iptr; /* image data pointers */ -- unsigned long (*loader)(); /* unit loading function */ -+ unsigned long (*loader)(byte *, unsigned int); /* unit loading function */ - - image= newBitImage(header.pixmap_width, header.pixmap_height); - ilinelen= (header.pixmap_width / 8) + (header.pixmap_width % 8 ? 1 : 0); -@@ -218,10 +210,7 @@ static Image *loadXYBitmap(fullname, zf, - * build the destination. 1-bit images are handled by XYBitmap. - */ - --static Image *loadXYPixmap(fullname, zf, header) -- char *fullname; -- ZFILE *zf; -- XWDHeader header; -+static Image *loadXYPixmap(char *fullname, ZFILE *zf, XWDHeader header) - { Image *image; - int plane; - int dlinelen; /* length of scan line in data file */ -@@ -237,7 +226,7 @@ static Image *loadXYPixmap(fullname, zf, - byte *dptr, *iptr; /* image data pointers */ - unsigned long pixvals; /* bits for pixels in this unit */ - unsigned long mask; -- unsigned long (*loader)(); /* unit loading function */ -+ unsigned long (*loader)(byte *, unsigned int); /* unit loading function */ - - image= newRGBImage(header.pixmap_width, header.pixmap_height, - header.pixmap_depth); -@@ -313,10 +302,7 @@ static Image *loadXYPixmap(fullname, zf, - * you gotta problem. 1-bit images are handled by XYBitmap. - */ - --static Image *loadZPixmap(fullname, zf, header) -- char *fullname; -- ZFILE *zf; -- XWDHeader header; -+static Image *loadZPixmap(char *fullname, ZFILE *zf, XWDHeader header) - { Image *image; - int dlinelen; /* length of scan line in data file */ - int ilinelen; /* length of scan line in image file */ -@@ -327,7 +313,7 @@ static Image *loadZPixmap(fullname, zf, - byte *dptr, *iptr; /* image data pointers */ - unsigned long pixmask; /* bit mask within pixel */ - unsigned long pixel; /* pixel we're working on */ -- unsigned long (*loader)(); /* unit loading function */ -+ unsigned long (*loader)(byte *, unsigned int); /* unit loading function */ - - image= newRGBImage(header.pixmap_width, header.pixmap_height, - header.pixmap_depth); -@@ -408,9 +394,7 @@ static Image *loadZPixmap(fullname, zf, - return(image); - } - --Image *xwdLoad(fullname, name, verbose) -- char *fullname, *name; -- int verbose; -+Image *xwdLoad(char *fullname, char *name, unsigned int verbose) - { ZFILE *zf; - XWDHeader header; - int cmaplen; -diff -up xloadimage.4.1/zio.c.c23 xloadimage.4.1/zio.c ---- xloadimage.4.1/zio.c.c23 2025-02-24 15:41:17.664718091 -0500 -+++ xloadimage.4.1/zio.c 2025-02-24 15:41:17.690029930 -0500 -@@ -27,10 +27,7 @@ static ZFILE ZFileTable[MAX_ZFILES]; - /* read some info through the read cache - */ - --static int doRead(zf, buf, len) -- ZFILE *zf; -- byte *buf; -- int len; -+static int doRead(ZFILE *zf, byte *buf, int len) - { int bread, readlen; - - /* loop through the read -@@ -85,8 +82,7 @@ static int doRead(zf, buf, len) - /* reset a read cache - */ - --void zreset(filename) -- char *filename; -+void zreset(char *filename) - { int a; - struct cache *old; - -@@ -138,8 +134,7 @@ void zreset(filename) - } - } - --ZFILE *zopen(name) -- char *name; -+ZFILE *zopen(char *name) - { int a; - ZFILE *zf; - char buf[BUFSIZ]; -@@ -262,16 +257,12 @@ ZFILE *zopen(name) - return(zf); - } - --int zread(zf, buf, len) -- ZFILE *zf; -- byte *buf; -- unsigned int len; -+int zread(ZFILE *zf, byte *buf, unsigned int len) - { - return(doRead(zf, buf, len)); - } - --int zgetc(zf) -- ZFILE *zf; -+int zgetc(ZFILE *zf) - { unsigned char c; - - if (doRead(zf, &c, 1) > 0) -@@ -280,10 +271,7 @@ int zgetc(zf) - return(EOF); - } - --char *zgets(buf, size, zf) -- byte *buf; -- unsigned int size; -- ZFILE *zf; -+char *zgets(byte *buf, unsigned int size, ZFILE *zf) - { int p= 0; - - while (doRead(zf, buf + p, 1) > 0) { -@@ -302,8 +290,7 @@ char *zgets(buf, size, zf) - * need to re-open it - */ - --void znocache(zf) -- ZFILE *zf; -+void znocache(ZFILE *zf) - { - debug(("znocache(\"%s\") called\n", zf->filename)); - zf->nocache= 1; -@@ -313,8 +300,7 @@ void znocache(zf) - * zreset() is called with the filename. - */ - --void zclose(zf) -- ZFILE *zf; -+void zclose(ZFILE *zf) - { - debug(("zclose(\"%s\") called\n", zf->filename)); - zf->dataptr= zf->data; -diff -up xloadimage.4.1/zoom.c.c23 xloadimage.4.1/zoom.c ---- xloadimage.4.1/zoom.c.c23 2025-02-24 15:41:17.664857979 -0500 -+++ xloadimage.4.1/zoom.c 2025-02-24 15:41:17.690094798 -0500 -@@ -11,10 +11,7 @@ - #include "copyright.h" - #include "image.h" - --static unsigned int *buildIndex(width, zoom, rwidth) -- unsigned int width; -- unsigned int zoom; -- unsigned int *rwidth; -+static unsigned int *buildIndex(unsigned int width, unsigned int zoom, unsigned int *rwidth) - { float fzoom; - unsigned int *index; - unsigned int a; -@@ -36,10 +33,7 @@ static unsigned int *buildIndex(width, z - return(index); - } - --Image *zoom(oimage, xzoom, yzoom, verbose) -- Image *oimage; -- unsigned int xzoom, yzoom; -- unsigned int verbose; -+Image *zoom(Image *oimage, unsigned int xzoom, unsigned int yzoom, unsigned int verbose) - { char buf[BUFSIZ]; - Image *image; - unsigned int *xindex, *yindex; diff --git a/xloadimage-4.1-fix-mem-leak.patch b/xloadimage-4.1-fix-mem-leak.patch deleted file mode 100644 index 63a2c53..0000000 --- a/xloadimage-4.1-fix-mem-leak.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xloadimage.4.1/new.c.fix-mem-leak xloadimage.4.1/new.c ---- xloadimage.4.1/new.c.fix-mem-leak 2013-01-02 13:21:24.082069878 -0500 -+++ xloadimage.4.1/new.c 2013-01-02 13:22:04.427104519 -0500 -@@ -181,7 +181,7 @@ Image *newTrueImage(width, height) - image->depth= 24; - image->pixlen= 3; - image->data= (unsigned char *)lmalloc(ovmul(ovmul(width, height), 3)); -- image->data= (unsigned char *)lmalloc(width * height * 3); -+ /* image->data= (unsigned char *)lmalloc(width * height * 3); */ - return(image); - } - diff --git a/xloadimage-4.1-ignore-dummy-copyright-variables.patch b/xloadimage-4.1-ignore-dummy-copyright-variables.patch deleted file mode 100644 index 1dccfa3..0000000 --- a/xloadimage-4.1-ignore-dummy-copyright-variables.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up xloadimage.4.1/copyright.h.dummyvars xloadimage.4.1/copyright.h ---- xloadimage.4.1/copyright.h.dummyvars 2011-06-28 16:48:46.433752182 -0400 -+++ xloadimage.4.1/copyright.h 2011-06-28 16:48:53.230665806 -0400 -@@ -21,7 +21,7 @@ - - #ifndef __SABER__ - #ifndef LINT --static char *Copyright= "Copyright 1989, 1993 Jim Frost"; -+/* static char *Copyright= "Copyright 1989, 1993 Jim Frost"; */ - #endif /* LINT */ - #endif - #define _JIM_COPYRIGHT_ -diff -up xloadimage.4.1/kljcpyrght.h.dummyvars xloadimage.4.1/kljcpyrght.h ---- xloadimage.4.1/kljcpyrght.h.dummyvars 2011-06-28 16:48:58.206602576 -0400 -+++ xloadimage.4.1/kljcpyrght.h 2011-06-28 16:49:07.386485923 -0400 -@@ -23,7 +23,7 @@ - - #ifndef __SABER__ - #ifndef LINT --static char *KLJCopyright = "Copyright 1989, 1990 Kirk L. Johnson"; -+/* static char *KLJCopyright = "Copyright 1989, 1990 Kirk L. Johnson"; */ - #endif /* LINT */ - #endif - #define _KLJ_COPYRIGHT_ diff --git a/xloadimage-4.1-libtiff4.patch b/xloadimage-4.1-libtiff4.patch deleted file mode 100644 index 7d6c839..0000000 --- a/xloadimage-4.1-libtiff4.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up xloadimage.4.1/tiff.c.tiff4 xloadimage.4.1/tiff.c ---- xloadimage.4.1/tiff.c.tiff4 2012-05-07 18:00:10.384739299 -0400 -+++ xloadimage.4.1/tiff.c 2012-05-07 18:01:16.685241646 -0400 -@@ -34,14 +34,14 @@ static TIFF *is_tiff(fullname, name, inf - struct tiff_info *info; - { - ZFILE *zf; -- TIFFHeader th; -+ TIFFHeaderClassic th; - TIFF *tiff; - - zf = zopen(fullname); - - /* read TIFF header and see if it looks right - */ -- if ((zread(zf, (byte *)&th, sizeof(TIFFHeader)) == sizeof(TIFFHeader)) && -+ if ((zread(zf, (byte *)&th, sizeof(TIFFHeaderClassic)) == sizeof(TIFFHeaderClassic)) && - ((th.tiff_magic == TIFF_BIGENDIAN) || - (th.tiff_magic == TIFF_LITTLEENDIAN))) { - diff --git a/xloadimage-4.1-png-1.5.patch b/xloadimage-4.1-png-1.5.patch deleted file mode 100644 index f02c459..0000000 --- a/xloadimage-4.1-png-1.5.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up xloadimage.4.1/png.c.png15 xloadimage.4.1/png.c ---- xloadimage.4.1/png.c.png15 2012-11-27 16:24:36.512125771 -0500 -+++ xloadimage.4.1/png.c 2012-11-27 16:28:15.216129052 -0500 -@@ -75,7 +75,7 @@ static void output_error(png_structp png - { - debug(" #error "); - output_warn( png_ptr, str); -- longjmp(png_ptr->jmpbuf, 1); /* return control to outer routine */ -+ longjmp(png_jmpbuf(png_ptr), 1); /* return control to outer routine */ - } - - -@@ -164,7 +164,7 @@ static int pngHeader(png_structpp png_pp - png_destroy_read_struct(png_pp, info_pp, end_pp); - return 0; - } -- if (setjmp((*png_pp)->jmpbuf)) { -+ if (setjmp(png_jmpbuf(*png_pp))) { - /* On error */ - png_destroy_read_struct(png_pp, info_pp, end_pp); - return 0; -@@ -220,7 +220,7 @@ int pngIdent(char *fullname, char *name) - zclose(zinput_file); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* On error */ - freeImage(image); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); -@@ -308,7 +308,7 @@ Image *pngLoad(char *fullname, char *nam - case PNG_COLOR_TYPE_GRAY_ALPHA: - case PNG_COLOR_TYPE_GRAY: - if (bit_depth < 8) -- png_set_gray_1_2_4_to_8(png_ptr); /* 1 pixlel 1 byte */ -+ png_set_expand_gray_1_2_4_to_8(png_ptr); /* 1 pixlel 1 byte */ - image = newRGBImage(width, height, 8); - image->rgb.used = 256; - for (i = 0; i < 256; i++) { diff --git a/xloadimage-4.1-png-pkg-config.patch b/xloadimage-4.1-png-pkg-config.patch deleted file mode 100644 index 65b3b11..0000000 --- a/xloadimage-4.1-png-pkg-config.patch +++ /dev/null @@ -1,7463 +0,0 @@ -diff -up xloadimage.4.1/configure.in.png-pkg-config xloadimage.4.1/configure.in ---- xloadimage.4.1/configure.in.png-pkg-config 2012-11-27 14:57:17.378047157 -0500 -+++ xloadimage.4.1/configure.in 2012-11-27 16:22:15.330123652 -0500 -@@ -16,7 +16,10 @@ AC_CHECK_LIB(m, main) - dnl Replace `main' with a function in -lz: - AC_CHECK_LIB(z, main) - dnl Replace `main' with a function in -lpng: --AC_CHECK_LIB(png, main) -+PKG_CHECK_MODULES(PNG, libpng, HAVE_LIBPNG="yes", HAVE_LIBPNG="no") -+if test "x$HAVE_LIBPNG" = xyes ; then -+ AC_DEFINE([HAVE_LIBPNG], [], [Define if we have libpng.]) -+fi - dnl Replace `main' with a function in -ljpeg: - AC_CHECK_LIB(jpeg, main) - dnl Replace `main' with a function in -ltiff: -diff -up xloadimage.4.1/configure.png-pkg-config xloadimage.4.1/configure ---- xloadimage.4.1/configure.png-pkg-config 2012-11-27 14:57:17.378047157 -0500 -+++ xloadimage.4.1/configure 2012-11-27 16:22:24.239123786 -0500 -@@ -1,28 +1,716 @@ - #! /bin/sh -- - # Guess values for system-dependent variables and create Makefiles. --# Generated automatically using autoconf version 2.13 --# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -+# Generated by GNU Autoconf 2.69. -+# -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# - # - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+ -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." -+ else -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." -+ fi -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - --# Defaults: --ac_help= -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+ -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } -+ -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' -+ fi -+else -+ as_ln_s='cp -pR' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p='mkdir -p "$as_dir"' -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+test -n "$DJDIR" || exec 7<&0 &1 -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+# -+# Initializations. -+# - ac_default_prefix=/usr/local --# Any additions from configure.in: --ac_help="$ac_help -- --with-x use the X Window System" -+ac_clean_files= -+ac_config_libobj_dir=. -+LIBOBJS= -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+ -+# Identity of this package. -+PACKAGE_NAME= -+PACKAGE_TARNAME= -+PACKAGE_VERSION= -+PACKAGE_STRING= -+PACKAGE_BUGREPORT= -+PACKAGE_URL= -+ -+ac_unique_file="xloadimage.c" -+# Factoring default headers for most tests. -+ac_includes_default="\ -+#include -+#ifdef HAVE_SYS_TYPES_H -+# include -+#endif -+#ifdef HAVE_SYS_STAT_H -+# include -+#endif -+#ifdef STDC_HEADERS -+# include -+# include -+#else -+# ifdef HAVE_STDLIB_H -+# include -+# endif -+#endif -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -+# include -+# endif -+# include -+#endif -+#ifdef HAVE_STRINGS_H -+# include -+#endif -+#ifdef HAVE_INTTYPES_H -+# include -+#endif -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H -+# include -+#endif" -+ -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+PNG_LIBS -+PNG_CFLAGS -+PKG_CONFIG_LIBDIR -+PKG_CONFIG_PATH -+PKG_CONFIG -+EGREP -+GREP -+X_EXTRA_LIBS -+X_LIBS -+X_PRE_LIBS -+X_CFLAGS -+CPP -+XMKMF -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' -+ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_x -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+XMKMF -+CPP -+PKG_CONFIG -+PKG_CONFIG_PATH -+PKG_CONFIG_LIBDIR -+PNG_CFLAGS -+PNG_LIBS' -+ - - # Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. --build=NONE --cache_file=./config.cache -+cache_file=/dev/null - exec_prefix=NONE --host=NONE - no_create= --nonopt=NONE - no_recursion= - prefix=NONE - program_prefix=NONE -@@ -31,94 +719,132 @@ program_transform_name=s,x,x, - silent= - site= - srcdir= --target=NONE - verbose= - x_includes=NONE - x_libraries=NONE -+ -+# Installation directory options. -+# These are left unexpanded so users can "make install exec_prefix=/foo" -+# and all the variables that are supposed to be based on exec_prefix -+# by default will actually change. -+# Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -- --# Initialize some other variables. --subdirs= --MFLAGS= MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} --# Maximum number of lines to put in a shell here document. --ac_max_here_lines=12 -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do -- - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- case "$ac_option" in -- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -- *) ac_optarg= ;; -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case "$ac_option" in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -- bindir="$ac_optarg" ;; -+ bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) -- ac_prev=build ;; -+ ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) -- build="$ac_optarg" ;; -+ build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -- cache_file="$ac_optarg" ;; -+ cache_file=$ac_optarg ;; -+ -+ --config-cache | -C) -+ cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -- datadir="$ac_optarg" ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) -+ datadir=$ac_optarg ;; -+ -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then -- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -- fi -- ac_feature=`echo $ac_feature| sed 's/-/_/g'` -- eval "enable_${ac_feature}=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then -- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -- fi -- ac_feature=`echo $ac_feature| sed 's/-/_/g'` -- case "$ac_option" in -- *=*) ;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_${ac_feature}='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -127,116 +853,77 @@ do - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) -- exec_prefix="$ac_optarg" ;; -+ exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - -- -help | --help | --hel | --he) -- # Omit some internal or obsolete options to make the list less imposing. -- # This message is too long to be a string in the A/UX 3.1 sh. -- cat << EOF --Usage: configure [options] [host] --Options: [defaults in brackets after descriptions] --Configuration: -- --cache-file=FILE cache test results in FILE -- --help print this message -- --no-create do not create output files -- --quiet, --silent do not print \`checking...' messages -- --version print the version of autoconf that created configure --Directory and file names: -- --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [same as prefix] -- --bindir=DIR user executables in DIR [EPREFIX/bin] -- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -- --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data in DIR -- [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data in DIR -- [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -- --libdir=DIR object code libraries in DIR [EPREFIX/lib] -- --includedir=DIR C header files in DIR [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -- --infodir=DIR info documentation in DIR [PREFIX/info] -- --mandir=DIR man documentation in DIR [PREFIX/man] -- --srcdir=DIR find the sources in DIR [configure dir or ..] -- --program-prefix=PREFIX prepend PREFIX to installed program names -- --program-suffix=SUFFIX append SUFFIX to installed program names -- --program-transform-name=PROGRAM -- run sed PROGRAM on installed program names --EOF -- cat << EOF --Host type: -- --build=BUILD configure for building on BUILD [BUILD=HOST] -- --host=HOST configure for HOST [guessed] -- --target=TARGET configure for TARGET [TARGET=HOST] --Features and packages: -- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --x-includes=DIR X include files are in DIR -- --x-libraries=DIR X library files are in DIR --EOF -- if test -n "$ac_help"; then -- echo "--enable and --with options recognized:$ac_help" -- fi -- exit 0 ;; -+ -help | --help | --hel | --he | -h) -+ ac_init_help=long ;; -+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -+ ac_init_help=recursive ;; -+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -+ ac_init_help=short ;; - - -host | --host | --hos | --ho) -- ac_prev=host ;; -+ ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) -- host="$ac_optarg" ;; -+ host_alias=$ac_optarg ;; -+ -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) -- includedir="$ac_optarg" ;; -+ includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -- infodir="$ac_optarg" ;; -+ infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) -- libdir="$ac_optarg" ;; -+ libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) -- libexecdir="$ac_optarg" ;; -+ libexecdir=$ac_optarg ;; -+ -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -- localstatedir="$ac_optarg" ;; -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) -+ localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -- mandir="$ac_optarg" ;; -+ mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) -+ | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -250,26 +937,26 @@ EOF - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -- oldincludedir="$ac_optarg" ;; -+ oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- prefix="$ac_optarg" ;; -+ prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -- program_prefix="$ac_optarg" ;; -+ program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -- program_suffix="$ac_optarg" ;; -+ program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ -@@ -286,7 +973,17 @@ EOF - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) -- program_transform_name="$ac_optarg" ;; -+ program_transform_name=$ac_optarg ;; -+ -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) -@@ -296,7 +993,7 @@ EOF - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) -- sbindir="$ac_optarg" ;; -+ sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -@@ -307,58 +1004,67 @@ EOF - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) -- sharedstatedir="$ac_optarg" ;; -+ sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) -- site="$ac_optarg" ;; -+ site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- srcdir="$ac_optarg" ;; -+ srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -- sysconfdir="$ac_optarg" ;; -+ sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) -- ac_prev=target ;; -+ ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -- target="$ac_optarg" ;; -+ target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - -- -version | --version | --versio | --versi | --vers) -- echo "configure generated by autoconf version 2.13" -- exit 0 ;; -+ -version | --version | --versio | --versi | --vers | -V) -+ ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then -- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -- fi -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case "$ac_option" in -- *=*) ;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_${ac_package}='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`echo $ac_option|sed -e 's/-*without-//'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then -- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -- fi -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- eval "with_${ac_package}=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -369,370 +1075,1722 @@ EOF - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -- x_includes="$ac_optarg" ;; -+ x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -- x_libraries="$ac_optarg" ;; -+ x_libraries=$ac_optarg ;; - -- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - -+ *=*) -+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -+ # Reject names that are not valid shell variable names. -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg -+ export $ac_envvar ;; -+ - *) -- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then -- echo "configure: warning: $ac_option: invalid host type" 1>&2 -- fi -- if test "x$nonopt" != xNONE; then -- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } -- fi -- nonopt="$ac_option" -+ # FIXME: should be removed in autoconf 3.0. -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac - done - - if test -n "$ac_prev"; then -- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` -+ as_fn_error $? "missing argument to $ac_option" - fi - --trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -- --# File descriptor usage: --# 0 standard input --# 1 file creation --# 2 errors and warnings --# 3 some systems may open it to /dev/tty --# 4 used on the Kubota Titan --# 6 checking for... messages and results --# 5 compiler messages saved in config.log --if test "$silent" = yes; then -- exec 6>/dev/null --else -- exec 6>&1 -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac - fi --exec 5>./config.log -- --echo "\ --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. --" 1>&5 - --# Strip out --no-create and --no-recursion so they do not pile up. --# Also quote any args containing shell metacharacters. --ac_configure_args= --for ac_arg -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- case "$ac_arg" in -- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) ;; -- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -- ac_configure_args="$ac_configure_args '$ac_arg'" ;; -- *) ac_configure_args="$ac_configure_args $ac_arg" ;; -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; - esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - --# NLS nuisances. --# Only set these to C if already set. These must not be set unconditionally --# because not all systems understand e.g. LANG=C (notably SCO). --# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! --# Non-C LC_CTYPE values break the ctype check. --if test "${LANG+set}" = set; then LANG=C; export LANG; fi --if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi --if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi --if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -+# There might be people who depend on the old broken behavior: `$host' -+# used to hold the argument of --host etc. -+# FIXME: To remove some day. -+build=$build_alias -+host=$host_alias -+target=$target_alias -+ -+# FIXME: To remove some day. -+if test "x$host_alias" != x; then -+ if test "x$build_alias" = x; then -+ cross_compiling=maybe -+ elif test "x$build_alias" != "x$host_alias"; then -+ cross_compiling=yes -+ fi -+fi -+ -+ac_tool_prefix= -+test -n "$host_alias" && ac_tool_prefix=$host_alias- -+ -+test "$silent" = yes && exec 6>/dev/null -+ -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" - --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo > confdefs.h -- --# A filename unique to this package, relative to the directory that --# configure is in, which we can look for to find out if srcdir is correct. --ac_unique_file=xloadimage.c - - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_prog=$0 -- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } -- else -- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } -- fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done -+ -+# -+# Report the --help message. -+# -+if test "$ac_init_help" = "long"; then -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat <<_ACEOF -+\`configure' configures this package to adapt to many kinds of systems. -+ -+Usage: $0 [OPTION]... [VAR=VALUE]... -+ -+To assign environment variables (e.g., CC, CFLAGS...), specify them as -+VAR=VALUE. See below for descriptions of some of the useful variables. -+ -+Defaults for the options are specified in brackets. -+ -+Configuration: -+ -h, --help display this help and exit -+ --help=short display options specific to this package -+ --help=recursive display the short help of all the included packages -+ -V, --version display version information and exit -+ -q, --quiet, --silent do not print \`checking ...' messages -+ --cache-file=FILE cache test results in FILE [disabled] -+ -C, --config-cache alias for \`--cache-file=config.cache' -+ -n, --no-create do not create output files -+ --srcdir=DIR find the sources in DIR [configure dir or \`..'] -+ -+Installation directories: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [PREFIX] -+ -+By default, \`make install' will install all the files in -+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than \`$ac_default_prefix' using \`--prefix', -+for instance \`--prefix=\$HOME'. -+ -+For better control, use the options below. -+ -+Fine tuning of the installation directories: -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] -+_ACEOF -+ -+ cat <<\_ACEOF -+ -+X features: -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+_ACEOF - fi --srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+if test -n "$ac_init_help"; then -+ -+ cat <<\_ACEOF -+ -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-x use the X Window System -+ -+Some influential environment variables: -+ CC C compiler command -+ CFLAGS C compiler flags -+ LDFLAGS linker flags, e.g. -L if you have libraries in a -+ nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory -+ XMKMF Path to xmkmf, Makefile generator for X Window System -+ CPP C preprocessor -+ PKG_CONFIG path to pkg-config utility -+ PKG_CONFIG_PATH -+ directories to add to pkg-config's search path -+ PKG_CONFIG_LIBDIR -+ path overriding pkg-config's built-in search path -+ PNG_CFLAGS C compiler flags for PNG, overriding pkg-config -+ PNG_LIBS linker flags for PNG, overriding pkg-config -+ -+Use these variables to override the choices made by `configure' or to help -+it to find libraries and programs with nonstandard names/locations. -+ -+Report bugs to the package provider. -+_ACEOF -+ac_status=$? -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive -+ else -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } -+ done -+fi -+ -+test -n "$ac_init_help" && exit $ac_status -+if $ac_init_version; then -+ cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.69 -+ -+Copyright (C) 2012 Free Software Foundation, Inc. -+This configure script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it. -+_ACEOF -+ exit -+fi -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err - fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case declares $2. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_func -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by $as_me, which was -+generated by GNU Autoconf 2.69. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; -+ 2) -+ as_fn_append ac_configure_args1 " '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ as_fn_append ac_configure_args " '$ac_arg'" -+ ;; -+ esac -+ done -+done -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} -+ -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -+trap 'exit_status=$? -+ # Save into config.log some information that might help in debugging. -+ { -+ echo -+ -+ $as_echo "## ---------------- ## -+## Cache variables. ## -+## ---------------- ##" -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ sed -n \ -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo -+ -+ $as_echo "## ----------------- ## -+## Output variables. ## -+## ----------------- ##" -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ $as_echo "## ----------- ## -+## confdefs.h. ## -+## ----------- ##" -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -+ exit $exit_status -+' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -+done -+ac_signal=0 -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h -+ -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ -+ -+# Let the site file select an alternate cache file if it wants to. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- echo "loading site script $ac_site_file" -- . "$ac_site_file" -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} -+ sed 's/^/| /' "$ac_site_file" >&5 -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- echo "loading cache $cache_file" -- . $cache_file -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; -+ esac -+ fi - else -- echo "creating cache $cache_file" -- > $cache_file --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} -+ >$cache_file -+fi -+ -+# Check that the precious variables saved in the cache have kept the same -+# value. -+ac_cache_corrupted=false -+for ac_var in $ac_precious_vars; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value -+ case $ac_old_set,$ac_new_set in -+ set,) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,set) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -+ fi;; -+ esac -+ # Pass precious variables to config.status. -+ if test "$ac_new_set" = set; then -+ case $ac_new_val in -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c --# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cc_cross -- --ac_exeext= --ac_objext=o --if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -- ac_n= ac_c=' --' ac_t=' ' -- else -- ac_n=-n ac_c= ac_t= -- fi --else -- ac_n= ac_c='\c' ac_t= --fi -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+ac_config_headers="$ac_config_headers config.h" - - --# Extract the first word of "gcc", so it can be a program name with args. --set dummy gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:532: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_CC="gcc" -- break -- fi -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="${ac_tool_prefix}gcc" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done - done -- IFS="$ac_save_ifs" -+IFS=$as_save_IFS -+ - fi - fi --CC="$ac_cv_prog_CC" -+CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$ac_t""no" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - --if test -z "$CC"; then -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:562: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ -+fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_prog_rejected=no -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" -- break -- fi -- done -- IFS="$ac_save_ifs" --if test $ac_prog_rejected = yes; then -- # We found a bogon in the path, so make sure we never use it. -- set dummy $ac_cv_prog_CC -- shift -- if test $# -gt 0; then -- # We chose a different compiler from the bogus one. -- # However, it has the same basename, so the bogon will be chosen -- # first if we set CC to just the basename; use the full file name. -- shift -- set dummy "$ac_dir/$ac_word" "$@" -- shift -- ac_cv_prog_CC="$@" -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_CC="gcc" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 - fi -+done -+ done -+IFS=$as_save_IFS -+ - fi - fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi --CC="$ac_cv_prog_CC" --if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&6 -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else -- echo "$ac_t""no" 1>&6 -+ CC="$ac_cv_prog_CC" - fi - -- if test -z "$CC"; then -- case "`uname -s`" in -- *win32* | *WIN32*) -- # Extract the first word of "cl", so it can be a program name with args. --set dummy cl; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:613: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}cc; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_CC="cl" -- break -- fi -- done -- IFS="$ac_save_ifs" --fi -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="${ac_tool_prefix}cc" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ - fi --CC="$ac_cv_prog_CC" -+fi -+CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$ac_t""no" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi -- ;; -- esac -+ -+ - fi -- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS - --echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:645: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ fi -+fi -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi - --ac_ext=c --# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cc_cross -- --cat > conftest.$ac_ext << EOF -- --#line 656 "configure" --#include "confdefs.h" -- --main(){return(0);} --EOF --if { (eval echo configure:661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- ac_cv_prog_cc_works=yes -- # If we can't run a trivial program, we are probably using a cross compiler. -- if (./conftest; exit) 2>/dev/null; then -- ac_cv_prog_cc_cross=no -- else -- ac_cv_prog_cc_cross=yes -+ -+fi -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl.exe -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 - fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_prog_cc_works=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi --rm -fr conftest* --ac_ext=c --# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cc_cross - --echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 --if test $ac_cv_prog_cc_works = no; then -- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -+ -+ test -n "$CC" && break -+ done - fi --echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:687: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 --echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 --cross_compiling=$ac_cv_prog_cc_cross -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl.exe -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_CC="$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS - --echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:692: checking whether we are using GNU C" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -- ac_cv_prog_gcc=yes -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+fi -+ -+fi -+ -+ -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } -+ -+# Provide some information about the compiler. -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -+# Try to create an executable without -o first, disregard a.out. -+# It will help us diagnose broken compilers, and finding out an intuition -+# of exeext. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' -+do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) -+ ;; -+ [ab].out ) -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. -+ break;; -+ * ) -+ break;; -+ esac -+done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- ac_cv_prog_gcc=no -+ ac_file='' - fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } -+ac_exeext=$ac_cv_exeext -+ -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # If both `conftest.exe' and `conftest' are `present' (well, observable) -+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -+# work properly (i.e., refer to `conftest.exe'), while it won't with -+# `rm'. -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ break;; -+ * ) break;; -+ esac -+done -+else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } -+fi -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } -+ -+rm -f conftest.$ac_ext -+EXEEXT=$ac_cv_exeext -+ac_exeext=$EXEEXT -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } - --echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if ${ac_cv_objext+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.o conftest.obj -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; -+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -+ break;; -+ esac -+done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } -+fi -+rm -f conftest.$ac_cv_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } -+OBJEXT=$ac_cv_objext -+ac_objext=$OBJEXT -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if ${ac_cv_c_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif - --if test $ac_cv_prog_gcc = yes; then -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_compiler_gnu=yes -+else -+ ac_compiler_gnu=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then - GCC=yes - else - GCC= - fi -- --ac_test_CFLAGS="${CFLAGS+set}" --ac_save_CFLAGS="$CFLAGS" --CFLAGS= --echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:720: checking whether ${CC-cc} accepts -g" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- echo 'void f(){}' > conftest.c --if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -+ac_test_CFLAGS=${CFLAGS+set} -+ac_save_CFLAGS=$CFLAGS -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if ${ac_cv_prog_cc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- ac_cv_prog_cc_g=no -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes - fi --rm -f conftest* -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -- --echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then -- CFLAGS="$ac_save_CFLAGS" -+ CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" -@@ -746,99 +2804,249 @@ else - CFLAGS= - fi - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if ${ac_cv_prog_cc_c89+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_prog_cc_c89=no -+ac_save_CC=$CC -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+struct stat; -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; -+{ -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; -+} -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; -+int -+main () -+{ -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg -+fi -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break -+done -+rm -f conftest.$ac_ext -+CC=$ac_save_CC -+ -+fi -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; -+ *) -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -+esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : -+ -+fi -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ - - --echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:753: checking how to run the C preprocessor" >&5 -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then --if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ if ${ac_cv_prog_CPP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- # This must be in double quotes, not single quotes, because CPP may get -- # substituted into the Makefile and "${CC-cc}" will confuse make. -- CPP="${CC-cc} -E" -+ # Double quotes because CPP needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. -- cat > conftest.$ac_ext < --Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP="${CC-cc} -E -traditional-cpp" -- cat > conftest.$ac_ext < --Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP="${CC-cc} -nologo -E" -- cat > conftest.$ac_ext < --Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP=/lib/cpp -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ -+else -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ # Broken: success on invalid input. -+continue -+else -+ # Passes both tests. -+ac_preproc_ok=: -+break - fi --rm -f conftest* -+rm -f conftest.err conftest.i conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ break - fi --rm -f conftest* -+ -+ done -+ ac_cv_prog_CPP=$CPP -+ - fi --rm -f conftest* -- ac_cv_prog_CPP="$CPP" -+ CPP=$ac_cv_prog_CPP -+else -+ ac_cv_prog_CPP=$CPP -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } -+ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ -+else -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ # Broken: success on invalid input. -+continue -+else -+ # Passes both tests. -+ac_preproc_ok=: -+break - fi -- CPP="$ac_cv_prog_CPP" -+rm -f conftest.err conftest.i conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- ac_cv_prog_CPP="$CPP" -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi --echo "$ac_t""$CPP" 1>&6 - --# If we find X, set shell vars x_includes and x_libraries to the --# paths, otherwise set no_x=yes. --# Uses ac_ vars as temps to allow command line to override cache and checks. --# --without-x overrides everything else, but does not touch the cache. --echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:837: checking for X" >&5 -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - --# Check whether --with-x or --without-x was given. --if test "${with_x+set}" = set; then -- withval="$with_x" -- : -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -+$as_echo_n "checking for X... " >&6; } -+ -+ -+# Check whether --with-x was given. -+if test "${with_x+set}" = set; then : -+ withval=$with_x; - fi - - # $have_x is `yes', `no', `disabled', or empty when we do not yet know. -@@ -846,227 +3054,189 @@ if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled - else -- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then -- # Both variables are already set. -- have_x=yes -- else --if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ case $x_includes,$x_libraries in #( -+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( -+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # One or both of the vars are not set, and there is no cached value. --ac_x_includes=NO ac_x_libraries=NO --rm -fr conftestdir --if mkdir conftestdir; then -- cd conftestdir -- # Make sure to not put "make" in the Imakefile rules, since we grep it out. -- cat > Imakefile <<'EOF' --acfindx: -- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' --EOF -- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -+ac_x_includes=no ac_x_libraries=no -+rm -f -r conftest.dir -+if mkdir conftest.dir; then -+ cd conftest.dir -+ cat >Imakefile <<'_ACEOF' -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' -+_ACEOF -+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+ for ac_var in incroot usrlibdir libdir; do -+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -+ done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl; do -- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -- test -f $ac_im_libdir/libX11.$ac_extension; then -- ac_im_usrlibdir=$ac_im_libdir; break -+ for ac_extension in a so sl dylib la dll; do -+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -+ test -f "$ac_im_libdir/libX11.$ac_extension"; then -+ ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. -- case "$ac_im_incroot" in -- /usr/include) ;; -- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; -+ case $ac_im_incroot in -+ /usr/include) ac_x_includes= ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac -- case "$ac_im_usrlibdir" in -- /usr/lib | /lib) ;; -- *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; -+ case $ac_im_usrlibdir in -+ /usr/lib | /usr/lib64 | /lib | /lib64) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. -- rm -fr conftestdir -+ rm -f -r conftest.dir - fi - --if test "$ac_x_includes" = NO; then -- # Guess where to find include files, by looking for this one X11 .h file. -- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -+# Standard set of common directories for X headers. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ac_x_header_dirs=' -+/usr/X11/include -+/usr/X11R7/include -+/usr/X11R6/include -+/usr/X11R5/include -+/usr/X11R4/include -+ -+/usr/include/X11 -+/usr/include/X11R7 -+/usr/include/X11R6 -+/usr/include/X11R5 -+/usr/include/X11R4 -+ -+/usr/local/X11/include -+/usr/local/X11R7/include -+/usr/local/X11R6/include -+/usr/local/X11R5/include -+/usr/local/X11R4/include -+ -+/usr/local/include/X11 -+/usr/local/include/X11R7 -+/usr/local/include/X11R6 -+/usr/local/include/X11R5 -+/usr/local/include/X11R4 -+ -+/usr/X386/include -+/usr/x386/include -+/usr/XFree86/include/X11 -+ -+/usr/include -+/usr/local/include -+/usr/unsupported/include -+/usr/athena/include -+/usr/local/x11r5/include -+/usr/lpp/Xamples/include -+ -+/usr/openwin/include -+/usr/openwin/share/include' - -+if test "$ac_x_includes" = no; then -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. --cat > conftest.$ac_ext < --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : - # We can compile using X headers with no special include directory. - ac_x_includes= - else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- # Look for the header file in a standard set of common directories. --# Check X11 before X11Rn because it is often a symlink to the current release. -- for ac_dir in \ -- /usr/X11/include \ -- /usr/X11R6/include \ -- /usr/X11R5/include \ -- /usr/X11R4/include \ -- \ -- /usr/include/X11 \ -- /usr/include/X11R6 \ -- /usr/include/X11R5 \ -- /usr/include/X11R4 \ -- \ -- /usr/local/X11/include \ -- /usr/local/X11R6/include \ -- /usr/local/X11R5/include \ -- /usr/local/X11R4/include \ -- \ -- /usr/local/include/X11 \ -- /usr/local/include/X11R6 \ -- /usr/local/include/X11R5 \ -- /usr/local/include/X11R4 \ -- \ -- /usr/X386/include \ -- /usr/x386/include \ -- /usr/XFree86/include/X11 \ -- \ -- /usr/include \ -- /usr/local/include \ -- /usr/unsupported/include \ -- /usr/athena/include \ -- /usr/local/x11r5/include \ -- /usr/lpp/Xamples/include \ -- \ -- /usr/openwin/include \ -- /usr/openwin/share/include \ -- ; \ -- do -- if test -r "$ac_dir/$x_direct_test_include"; then -- ac_x_includes=$ac_dir -- break -- fi -- done -+ for ac_dir in $ac_x_header_dirs; do -+ if test -r "$ac_dir/X11/Xlib.h"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+done - fi --rm -f conftest* --fi # $ac_x_includes = NO -+rm -f conftest.err conftest.i conftest.$ac_ext -+fi # $ac_x_includes = no - --if test "$ac_x_libraries" = NO; then -+if test "$ac_x_libraries" = no; then - # Check for the libraries. -- -- test -z "$x_direct_test_library" && x_direct_test_library=Xt -- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc -- - # See if we find them without any special options. - # Don't add to $LIBS permanently. -- ac_save_LIBS="$LIBS" -- LIBS="-l$x_direct_test_library $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- LIBS="$ac_save_LIBS" -+ ac_save_LIBS=$LIBS -+ LIBS="-lX11 $LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+XrmInitialize () -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries= - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- LIBS="$ac_save_LIBS" --# First see if replacing the include by lib works. --# Check X11 before X11Rn because it is often a symlink to the current release. --for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -- /usr/X11/lib \ -- /usr/X11R6/lib \ -- /usr/X11R5/lib \ -- /usr/X11R4/lib \ -- \ -- /usr/lib/X11 \ -- /usr/lib/X11R6 \ -- /usr/lib/X11R5 \ -- /usr/lib/X11R4 \ -- \ -- /usr/local/X11/lib \ -- /usr/local/X11R6/lib \ -- /usr/local/X11R5/lib \ -- /usr/local/X11R4/lib \ -- \ -- /usr/local/lib/X11 \ -- /usr/local/lib/X11R6 \ -- /usr/local/lib/X11R5 \ -- /usr/local/lib/X11R4 \ -- \ -- /usr/X386/lib \ -- /usr/x386/lib \ -- /usr/XFree86/lib/X11 \ -- \ -- /usr/lib \ -- /usr/local/lib \ -- /usr/unsupported/lib \ -- /usr/athena/lib \ -- /usr/local/x11r5/lib \ -- /usr/lpp/Xamples/lib \ -- /lib/usr/lib/X11 \ -- \ -- /usr/openwin/lib \ -- /usr/openwin/share/lib \ -- ; \ -+ LIBS=$ac_save_LIBS -+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` - do -- for ac_extension in a so sl; do -- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then -+ # Don't even attempt the hair of trying to link an X program! -+ for ac_extension in a so sl dylib la dll; do -+ if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done - done - fi --rm -f conftest* --fi # $ac_x_libraries = NO -- --if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then -- # Didn't find X anywhere. Cache the known absence of X. -- ac_cv_have_x="have_x=no" --else -- # Record where we found X for the cache. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" --fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi # $ac_x_libraries = no -+ -+case $ac_x_includes,$ac_x_libraries in #( -+ no,* | *,no | *\'*) -+ # Didn't find X, or a directory has "'" in its name. -+ ac_cv_have_x="have_x=no";; #( -+ *) -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$ac_x_includes'\ -+ ac_x_libraries='$ac_x_libraries'" -+esac - fi -- fi -+;; #( -+ *) have_x=yes;; -+ esac - eval "$ac_cv_have_x" - fi # $with_x != no - - if test "$have_x" != yes; then -- echo "$ac_t""$have_x" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -+$as_echo "$have_x" >&6; } - no_x=yes - else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -- echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$x_includes'\ -+ ac_x_libraries='$x_libraries'" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -+$as_echo "libraries $x_libraries, headers $x_includes" >&6; } - fi - - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. -- cat >> confdefs.h <<\EOF --#define X_DISPLAY_MISSING 1 --EOF -+ -+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= - else -@@ -1079,61 +3249,54 @@ else - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . -- case "`(uname -sr) 2>/dev/null`" in -- "SunOS 5"*) -- echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:1086: checking whether -R must be followed by a space" >&5 -- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- ac_R_nospace=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_R_nospace=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -+$as_echo_n "checking whether -R must be followed by a space... " >&6; } -+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -+ ac_xsave_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ X_LIBS="$X_LIBS -R$x_libraries" -+else -+ LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ X_LIBS="$X_LIBS -R $x_libraries" -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -+$as_echo "neither works" >&6; } - fi --rm -f conftest* -- if test $ac_R_nospace = yes; then -- echo "$ac_t""no" 1>&6 -- X_LIBS="$X_LIBS -R$x_libraries" -- else -- LIBS="$ac_xsave_LIBS -R $x_libraries" -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- ac_R_space=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_R_space=no -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi --rm -f conftest* -- if test $ac_R_space = yes; then -- echo "$ac_t""yes" 1>&6 -- X_LIBS="$X_LIBS -R $x_libraries" -- else -- echo "$ac_t""neither works" 1>&6 -- fi -- fi -- LIBS="$ac_xsave_LIBS" -- esac -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ ac_c_werror_flag=$ac_xsave_c_werror_flag -+ LIBS=$ac_xsave_LIBS - fi - - # Check for system-dependent libraries X programs must link with. -@@ -1143,565 +3306,591 @@ rm -f conftest* - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else -- # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X -- # libraries were built with DECnet support. And karl@cs.umb.edu says -+ # Martyn Johnson says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). -- echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:1151: checking for dnet_ntoa in -ldnet" >&5 --ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XOpenDisplay (); -+int -+main () -+{ -+return XOpenDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dnet_ntoa (); -+int -+main () -+{ -+return dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dnet_dnet_ntoa=yes -+else -+ ac_cv_lib_dnet_dnet_ntoa=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" --else -- echo "$ac_t""no" 1>&6 - fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:1192: checking for dnet_ntoa in -ldnet_stub" >&5 --ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet_stub $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dnet_ntoa (); -+int -+main () -+{ -+return dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dnet_stub_dnet_ntoa=yes -+else -+ ac_cv_lib_dnet_stub_dnet_ntoa=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" --else -- echo "$ac_t""no" 1>&6 - fi - - fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$ac_xsave_LIBS" - - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. -- # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display -- # on Irix 5.2, according to dickey@clark.net. -- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:1240: checking for gethostbyname" >&5 --if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gethostbyname(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) --choke me --#else --gethostbyname(); --#endif -+ # on Irix 5.2, according to T.E. Dickey. -+ # The functions gethostbyname, getservbyname, and inet_addr are -+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -+if test "x$ac_cv_func_gethostbyname" = xyes; then : - --; return 0; } --EOF --if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_gethostbyname=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_gethostbyname=no" --fi --rm -f conftest* --fi -- --if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 - fi - - if test $ac_cv_func_gethostbyname = no; then -- echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:1289: checking for gethostbyname in -lnsl" >&5 --ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+if ${ac_cv_lib_nsl_gethostbyname+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_nsl_gethostbyname=yes -+else -+ ac_cv_lib_nsl_gethostbyname=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" --else -- echo "$ac_t""no" 1>&6 - fi - -+ if test $ac_cv_lib_nsl_gethostbyname = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -+if ${ac_cv_lib_bsd_gethostbyname+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lbsd $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_bsd_gethostbyname=yes -+else -+ ac_cv_lib_bsd_gethostbyname=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -+fi -+ -+ fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -- # on later versions), says simon@lia.di.epfl.ch: it contains -- # gethostby* variants that don't use the nameserver (or something). -- # -lsocket must be given before -lnsl if both are needed. -- # We assume that if connect needs -lnsl, so does gethostbyname. -- echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:1338: checking for connect" >&5 --if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char connect(); -+ # on later versions), says Simon Leinen: it contains gethostby* -+ # variants that don't use the name server (or something). -lsocket -+ # must be given before -lnsl if both are needed. We assume that -+ # if connect needs -lnsl, so does gethostbyname. -+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -+if test "x$ac_cv_func_connect" = xyes; then : - --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_connect) || defined (__stub___connect) --choke me --#else --connect(); --#endif -- --; return 0; } --EOF --if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_connect=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_connect=no" --fi --rm -f conftest* --fi -- --if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 - fi - - if test $ac_cv_func_connect = no; then -- echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:1387: checking for connect in -lsocket" >&5 --ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -+$as_echo_n "checking for connect in -lsocket... " >&6; } -+if ${ac_cv_lib_socket_connect+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char connect (); -+int -+main () -+{ -+return connect (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_socket_connect=yes -+else -+ ac_cv_lib_socket_connect=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -+$as_echo "$ac_cv_lib_socket_connect" >&6; } -+if test "x$ac_cv_lib_socket_connect" = xyes; then : - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" --else -- echo "$ac_t""no" 1>&6 - fi - - fi - -- # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. -- echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:1430: checking for remove" >&5 --if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char remove(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_remove) || defined (__stub___remove) --choke me --#else --remove(); --#endif -- --; return 0; } --EOF --if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_remove=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_remove=no" --fi --rm -f conftest* --fi -+ # Guillermo Gomez says -lposix is necessary on A/UX. -+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -+if test "x$ac_cv_func_remove" = xyes; then : - --if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 - fi - - if test $ac_cv_func_remove = no; then -- echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:1479: checking for remove in -lposix" >&5 --ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -+$as_echo_n "checking for remove in -lposix... " >&6; } -+if ${ac_cv_lib_posix_remove+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char remove (); -+int -+main () -+{ -+return remove (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_posix_remove=yes -+else -+ ac_cv_lib_posix_remove=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -+$as_echo "$ac_cv_lib_posix_remove" >&6; } -+if test "x$ac_cv_lib_posix_remove" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" --else -- echo "$ac_t""no" 1>&6 - fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:1522: checking for shmat" >&5 --if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char shmat(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_shmat) || defined (__stub___shmat) --choke me --#else --shmat(); --#endif -- --; return 0; } --EOF --if { (eval echo configure:1550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_shmat=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_shmat=no" --fi --rm -f conftest* --fi -+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -+if test "x$ac_cv_func_shmat" = xyes; then : - --if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 - fi - - if test $ac_cv_func_shmat = no; then -- echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:1571: checking for shmat in -lipc" >&5 --ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -+$as_echo_n "checking for shmat in -lipc... " >&6; } -+if ${ac_cv_lib_ipc_shmat+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lipc $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shmat (); -+int -+main () -+{ -+return shmat (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ipc_shmat=yes -+else -+ ac_cv_lib_ipc_shmat=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -+$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -+if test "x$ac_cv_lib_ipc_shmat" = xyes; then : - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" --else -- echo "$ac_t""no" 1>&6 - fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. -- ac_save_LDFLAGS="$LDFLAGS" -+ ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. -- # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -- echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:1623: checking for IceConnectionNumber in -lICE" >&5 --ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ # John Interrante, Karl Berry -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lICE $X_EXTRA_LIBS $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char IceConnectionNumber (); -+int -+main () -+{ -+return IceConnectionNumber (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ICE_IceConnectionNumber=yes -+else -+ ac_cv_lib_ICE_IceConnectionNumber=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ -+ LDFLAGS=$ac_save_LDFLAGS - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if ${ac_cv_path_GREP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- echo "$ac_t""no" 1>&6 -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_GREP" || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if ${ac_cv_path_EGREP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_EGREP" || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac - -- LDFLAGS="$ac_save_LDFLAGS" -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP -+fi - -+ fi - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" -+ - --echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1667: checking for ANSI C header files" >&5 --if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat > conftest.$ac_ext <conftest.$ac_ext -+/* end confdefs.h. */ - #include - #include - #include - #include --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* - ac_cv_header_stdc=no - fi --rm -f conftest* -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. --cat > conftest.$ac_ext <conftest.$ac_ext -+/* end confdefs.h. */ - #include --EOF -+ -+_ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else -- rm -rf conftest* - ac_cv_header_stdc=no - fi - rm -f conftest* -@@ -1710,16 +3899,15 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. --cat > conftest.$ac_ext <conftest.$ac_ext -+/* end confdefs.h. */ - #include --EOF -+ -+_ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else -- rm -rf conftest* - ac_cv_header_stdc=no - fi - rm -f conftest* -@@ -1728,749 +3916,1757 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. --if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat > conftest.$ac_ext <conftest.$ac_ext -+/* end confdefs.h. */ - #include --#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#include -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif -+ - #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int main () { int i; for (i = 0; i < 256; i++) --if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); --exit (0); } -- --EOF --if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- : -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - ac_cv_header_stdc=no - fi --rm -fr conftest* -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - - fi - fi -- --echo "$ac_t""$ac_cv_header_stdc" 1>&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then -- cat >> confdefs.h <<\EOF --#define STDC_HEADERS 1 --EOF - --fi -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - --for ac_hdr in malloc.h strings.h sys/time.h unistd.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1774: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest* -+ -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 -+ -+done -+ -+ -+for ac_header in malloc.h strings.h sys/time.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ - fi -+ - done - - --echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 --echo "configure:1812: checking for main in -lm" >&5 --ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 -+$as_echo_n "checking for main in -lm... " >&6; } -+if ${ac_cv_lib_m_main+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lm $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -- cat >> confdefs.h <&5 -+$as_echo "$ac_cv_lib_m_main" >&6; } -+if test "x$ac_cv_lib_m_main" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBM 1 -+_ACEOF - - LIBS="-lm $LIBS" - --else -- echo "$ac_t""no" 1>&6 - fi - --echo $ac_n "checking for main in -lz""... $ac_c" 1>&6 --echo "configure:1855: checking for main in -lz" >&5 --ac_lib_var=`echo z'_'main | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5 -+$as_echo_n "checking for main in -lz... " >&6; } -+if ${ac_cv_lib_z_main+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-lz $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -- cat >> confdefs.h <&5 -+$as_echo "$ac_cv_lib_z_main" >&6; } -+if test "x$ac_cv_lib_z_main" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBZ 1 -+_ACEOF - - LIBS="-lz $LIBS" - --else -- echo "$ac_t""no" 1>&6 - fi - --echo $ac_n "checking for main in -lpng""... $ac_c" 1>&6 --echo "configure:1898: checking for main in -lpng" >&5 --ac_lib_var=`echo png'_'main | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lpng $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - -+ -+ -+ -+ -+ -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_PKG_CONFIG+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+$as_echo "$PKG_CONFIG" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -- cat >> confdefs.h <&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+$as_echo "$ac_pt_PKG_CONFIG" >&6; } - else -- echo "$ac_t""no" 1>&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - --echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6 --echo "configure:1941: checking for main in -ljpeg" >&5 --ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi - else -- ac_save_LIBS="$LIBS" --LIBS="-ljpeg $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" - fi --rm -f conftest* --LIBS="$ac_save_LIBS" - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -- cat >> confdefs.h <&5 -+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ PKG_CONFIG="" -+ fi -+fi -+ -+pkg_failed=no -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5 -+$as_echo_n "checking for PNG... " >&6; } -+ -+if test -n "$PNG_CFLAGS"; then -+ pkg_cv_PNG_CFLAGS="$PNG_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$PNG_LIBS"; then -+ pkg_cv_PNG_LIBS="$PNG_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng" 2>&1` -+ else -+ PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$PNG_PKG_ERRORS" >&5 -+ -+ HAVE_LIBPNG="no" -+elif test $pkg_failed = untried; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ HAVE_LIBPNG="no" -+else -+ PNG_CFLAGS=$pkg_cv_PNG_CFLAGS -+ PNG_LIBS=$pkg_cv_PNG_LIBS -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ HAVE_LIBPNG="yes" -+fi -+if test "x$HAVE_LIBPNG" = xyes ; then -+ -+$as_echo "#define HAVE_LIBPNG /**/" >>confdefs.h -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 -+$as_echo_n "checking for main in -ljpeg... " >&6; } -+if ${ac_cv_lib_jpeg_main+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljpeg $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+int -+main () -+{ -+return main (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jpeg_main=yes -+else -+ ac_cv_lib_jpeg_main=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 -+$as_echo "$ac_cv_lib_jpeg_main" >&6; } -+if test "x$ac_cv_lib_jpeg_main" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBJPEG 1 -+_ACEOF - - LIBS="-ljpeg $LIBS" - --else -- echo "$ac_t""no" 1>&6 - fi - --echo $ac_n "checking for main in -ltiff""... $ac_c" 1>&6 --echo "configure:1984: checking for main in -ltiff" >&5 --ac_lib_var=`echo tiff'_'main | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltiff" >&5 -+$as_echo_n "checking for main in -ltiff... " >&6; } -+if ${ac_cv_lib_tiff_main+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_save_LIBS="$LIBS" -+ ac_check_lib_save_LIBS=$LIBS - LIBS="-ltiff $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -- cat >> confdefs.h <&5 -+$as_echo "$ac_cv_lib_tiff_main" >&6; } -+if test "x$ac_cv_lib_tiff_main" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBTIFF 1 -+_ACEOF - - LIBS="-ltiff $LIBS" - --else -- echo "$ac_t""no" 1>&6 - fi - - - - --echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:2030: checking return type of signal handlers" >&5 --if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if ${ac_cv_type_signal+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat > conftest.$ac_ext <conftest.$ac_ext -+/* end confdefs.h. */ - #include - #include --#ifdef signal --#undef signal --#endif --#ifdef __cplusplus --extern "C" void (*signal (int, void (*)(int)))(int); --#else --void (*signal ()) (); --#endif - --int main() { --int i; --; return 0; } --EOF --if { (eval echo configure:2052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- ac_cv_type_signal=void --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -+int -+main () -+{ -+return *(signal (0, 0)) (0) == 1; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -+else -+ ac_cv_type_signal=void - fi --rm -f conftest* -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } - --echo "$ac_t""$ac_cv_type_signal" 1>&6 --cat >> confdefs.h <>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal --EOF -- -- --for ac_func in mkdir select --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2073: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -- --int main() { -+_ACEOF - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif - --; return 0; } --EOF --if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" --fi --rm -f conftest* --fi -+for ac_func in select -+do : -+ ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" -+if test "x$ac_cv_func_select" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SELECT 1 -+_ACEOF - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 - fi - done - - --trap '' 1 2 15 --cat > confcache <<\EOF -+ac_config_files="$ac_config_files Makefile" -+ -+cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure --# scripts and configure runs. It is not useful on other systems. --# If it contains results you don't want to keep, you may remove or edit it. -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. - # --# By default, configure uses ./config.cache as the cache file, --# creating it if it does not exist already. You can give configure --# the --cache-file=FILE option to use a different cache file; that is --# what configure does when it calls configure scripts in --# subdirectories, so they share the cache. --# Giving --cache-file=/dev/null disables caching, for debugging configure. --# config.status only pays attention to the cache file if you give it the --# --recheck option to rerun configure. -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. - # --EOF -+# `ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --(set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote substitution -- # turns \\\\ into \\, and sed turns \\ into \). -- sed -n \ -- -e "s/'/'\\\\''/g" \ -- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -- ;; -- *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -- ;; -- esac >> confcache --if cmp -s $cache_file confcache; then -- : --else -- if test -w $cache_file; then -- echo "updating cache $cache_file" -- cat confcache > $cache_file -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache - --trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -- - test "x$prefix" = xNONE && prefix=$ac_default_prefix - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# Any assignment to VPATH causes Sun make to only execute --# the first set of double-colon rules, so remove it if not needed. --# If there is a colon in the path, we need to keep it. --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' --fi -+DEFS=-DHAVE_CONFIG_H - --trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -+ac_libobjs= -+ac_ltlibobjs= -+U= -+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -+done -+LIBOBJS=$ac_libobjs - --DEFS=-DHAVE_CONFIG_H -+LTLIBOBJS=$ac_ltlibobjs - --# Without the "./", some shells look in PATH for config.status. --: ${CONFIG_STATUS=./config.status} - --echo creating $CONFIG_STATUS --rm -f $CONFIG_STATUS --cat > $CONFIG_STATUS <&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -+#! $SHELL -+# Generated by $as_me. - # Run this file to recreate the current configuration. --# This directory was configured as follows, --# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: --# --# $0 $ac_configure_args --# - # Compiler output produced by configure, useful for debugging --# configure, is in ./config.log if it exists. -+# configure, is in config.log if it exists. - --ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" --for ac_option -+debug=false -+ac_cs_recheck=false -+ac_cs_silent=false -+ -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+ -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' -+ fi -+else -+ as_ln_s='cp -pR' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p='mkdir -p "$as_dir"' -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. -+ac_log=" -+This file was extended by $as_me, which was -+generated by GNU Autoconf 2.69. Invocation command line was -+ -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ -+ -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ -+_ACEOF -+ -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac -+ -+case $ac_config_headers in *" -+"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+esac -+ -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ac_cs_usage="\ -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. -+ -+Usage: $0 [OPTION]... [TAG]... -+ -+ -h, --help print this help, then exit -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages -+ -d, --debug don't remove temporary files -+ --recheck update $as_me by reconfiguring in the same conditions -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE -+ -+Configuration files: -+$config_files -+ -+Configuration headers: -+$config_headers -+ -+Report bugs to the package provider." -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -+ac_cs_version="\\ -+config.status -+configured by $0, generated by GNU Autoconf 2.69, -+ with options \\"\$ac_cs_config\\" -+ -+Copyright (C) 2012 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. -+ac_need_defaults=: -+while test $# != 0 - do -- case "\$ac_option" in -+ case $1 in -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift -+ ;; -+ esac -+ -+ case $ac_option in -+ # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" -- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -- -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -- echo "$CONFIG_STATUS generated by autoconf version 2.13" -- exit 0 ;; -- -help | --help | --hel | --he | --h) -- echo "\$ac_cs_usage"; exit 0 ;; -- *) echo "\$ac_cs_usage"; exit 1 ;; -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) -+ debug=: ;; -+ --file | --fil | --fi | --f ) -+ $ac_shift -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" -+ ac_need_defaults=false;; -+ --header | --heade | --head | --hea ) -+ $ac_shift -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_HEADERS " '$ac_optarg'" -+ ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ as_fn_error $? "ambiguous option: \`$1' -+Try \`$0 --help' for more information.";; -+ --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; -+ -+ # This is an error. -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; -+ -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; -+ - esac -+ shift - done - --ac_given_srcdir=$srcdir -- --trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 --EOF --cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF --$ac_vpsub --$extrasub --s%@SHELL@%$SHELL%g --s%@CFLAGS@%$CFLAGS%g --s%@CPPFLAGS@%$CPPFLAGS%g --s%@CXXFLAGS@%$CXXFLAGS%g --s%@FFLAGS@%$FFLAGS%g --s%@DEFS@%$DEFS%g --s%@LDFLAGS@%$LDFLAGS%g --s%@LIBS@%$LIBS%g --s%@exec_prefix@%$exec_prefix%g --s%@prefix@%$prefix%g --s%@program_transform_name@%$program_transform_name%g --s%@bindir@%$bindir%g --s%@sbindir@%$sbindir%g --s%@libexecdir@%$libexecdir%g --s%@datadir@%$datadir%g --s%@sysconfdir@%$sysconfdir%g --s%@sharedstatedir@%$sharedstatedir%g --s%@localstatedir@%$localstatedir%g --s%@libdir@%$libdir%g --s%@includedir@%$includedir%g --s%@oldincludedir@%$oldincludedir%g --s%@infodir@%$infodir%g --s%@mandir@%$mandir%g --s%@CC@%$CC%g --s%@CPP@%$CPP%g --s%@X_CFLAGS@%$X_CFLAGS%g --s%@X_PRE_LIBS@%$X_PRE_LIBS%g --s%@X_LIBS@%$X_LIBS%g --s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -- --CEOF --EOF -- --cat >> $CONFIG_STATUS <<\EOF -- --# Split the substitutions into bite-sized pieces for seds with --# small command number limits, like on Digital OSF/1 and HP-UX. --ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. --ac_file=1 # Number of current file. --ac_beg=1 # First line for current file. --ac_end=$ac_max_sed_cmds # Line after last line for current file. --ac_more_lines=: --ac_sed_cmds="" --while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file -+ac_configure_extra_args= -+ -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+if \$ac_cs_recheck; then -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ -+# Handling of arguments. -+for ac_config_target in $ac_config_targets -+do -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -+ esac -+done -+ -+ -+# If the user did not use the arguments to specify the items to instantiate, -+# then the envvar interface is used. Set only those that are not. -+# We use the long form for the default assignment because of an extremely -+# bizarre bug on SunOS 4.1.3. -+if $ac_need_defaults; then -+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -+fi -+ -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. -+$debug || -+{ -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 -+} -+# Create a (secure) tmp directory for tmp files. -+ -+{ -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" -+} || -+{ -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -+_ACEOF -+ -+ -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else -- sed "${ac_end}q" conftest.subs > conftest.s$ac_file -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -- if test ! -s conftest.s$ac_file; then -- ac_more_lines=false -- rm -f conftest.s$ac_file -- else -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f conftest.s$ac_file" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" -- fi -- ac_file=`expr $ac_file + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_cmds` -- fi --done --if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat --fi --EOF -- --cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF --for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case "$ac_file" in -- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` -- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -- *) ac_file_in="${ac_file}.in" ;; -- esac -- -- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. -- -- # Remove last slash and all that follows it. Not all systems have dirname. -- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -- # The file is in a subdirectory. -- test ! -d "$ac_dir" && mkdir "$ac_dir" -- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" -- # A "../" for each directory in $ac_dir_suffix. -- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" -+ -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -+_ACEOF -+ -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" -+ -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$ac_tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script `defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_tt"; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else -- ac_dir_suffix= ac_dots= -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -+done - -- case "$ac_given_srcdir" in -- .) srcdir=. -- if test -z "$ac_dots"; then top_srcdir=. -- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; -- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; -- *) # Relative path. -- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" -- top_srcdir="$ac_dots$ac_given_srcdir" ;; -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' >$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", prefix defundef, macro, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -+fi # test -n "$CONFIG_HEADERS" -+ -+ -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; - esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done - -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} -+ fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - -- echo creating "$ac_file" -- rm -f "$ac_file" -- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." -- case "$ac_file" in -- *Makefile*) ac_comsub="1i\\ --# $configure_input" ;; -- *) ac_comsub= ;; -- esac -- -- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -- sed -e "$ac_comsub --s%@configure_input@%$configure_input%g --s%@srcdir@%$srcdir%g --s%@top_srcdir@%$top_srcdir%g --" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file --fi; done --rm -f conftest.s* -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; -+ esac - --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' --ac_dC='\3' --ac_dD='%g' --# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". --ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='\([ ]\)%\1#\2define\3' --ac_uC=' ' --ac_uD='\4%g' --# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_eB='$%\1#\2define\3' --ac_eC=' ' --ac_eD='%g' -- --if test "${CONFIG_HEADERS+set}" != set; then --EOF --cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF --fi --for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case "$ac_file" in -- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` -- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -- *) ac_file_in="${ac_file}.in" ;; -- esac -- -- echo creating $ac_file -- -- rm -f conftest.frag conftest.in conftest.out -- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -- cat $ac_file_inputs > conftest.in -- --EOF -- --# Transform confdefs.h into a sed script conftest.vals that substitutes --# the proper values into config.h.in to produce config.h. And first: --# Protect against being on the right side of a sed subst in config.status. --# Protect against being in an unquoted here document in config.status. --rm -f conftest.vals --cat > conftest.hdr <<\EOF --s/[\\&%]/\\&/g --s%[\\$`]%\\&%g --s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp --s%ac_d%ac_u%gp --s%ac_u%ac_e%gp --EOF --sed -n -f conftest.hdr confdefs.h > conftest.vals --rm -f conftest.hdr -- --# This sed command replaces #undef with comments. This is necessary, for --# example, in the case of _POSIX_SOURCE, which is predefined and required --# on some systems where configure will not decide to define it. --cat >> conftest.vals <<\EOF --s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% --EOF -- --# Break up conftest.vals because some shells have a limit on --# the size of here documents, and old seds have small limits too. -- --rm -f conftest.tail --while : --do -- ac_lines=`grep -c . conftest.vals` -- # grep -c gives empty output for an empty file on some AIX systems. -- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi -- # Write a limited-size here document to conftest.frag. -- echo ' cat > conftest.frag <> $CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS -- echo 'CEOF -- sed -f conftest.frag conftest.in > conftest.out -- rm -f conftest.in -- mv conftest.out conftest.in --' >> $CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail -- rm -f conftest.vals -- mv conftest.tail conftest.vals --done --rm -f conftest.vals -- --cat >> $CONFIG_STATUS <<\EOF -- rm -f conftest.frag conftest.h -- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h -- cat conftest.in >> conftest.h -- rm -f conftest.in -- if cmp -s $ac_file conftest.h 2>/dev/null; then -- echo "$ac_file is unchanged" -- rm -f conftest.h -- else -- # Remove last slash and all that follows it. Not all systems have dirname. -- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -- # The file is in a subdirectory. -- test ! -d "$ac_dir" && mkdir "$ac_dir" -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} -+ -+ rm -f "$ac_tmp/stdin" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+ if test x"$ac_file" != x-; then -+ { -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" -+ } >"$ac_tmp/config.h" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -+$as_echo "$as_me: $ac_file is unchanged" >&6;} -+ else -+ rm -f "$ac_file" -+ mv "$ac_tmp/config.h" "$ac_file" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi -- rm -f $ac_file -- mv conftest.h $ac_file -+ else -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ -+ || as_fn_error $? "could not create -" "$LINENO" 5 - fi --fi; done -+ ;; -+ - --EOF --cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -- --exit 0 --EOF --chmod +x $CONFIG_STATUS --rm -fr confdefs* $ac_clean_files --test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -+ -+as_fn_exit 0 -+_ACEOF -+ac_clean_files=$ac_clean_files_save -+ -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ -+ -+# configure is writing to config.log, and then calls config.status. -+# config.status does its own redirection, appending to config.log. -+# Unfortunately, on DOS this fails, as config.log is still kept open -+# by configure, so config.status won't be able to write to it; its -+# output is simply discarded. So we exec the FD to /dev/null, -+# effectively closing config.log, so it can be properly (re)opened and -+# appended to by config.status. When coming back to configure, we -+# need to make the FD available again. -+if test "$no_create" != yes; then -+ ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" -+ exec 5>/dev/null -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -+ exec 5>>config.log -+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which -+ # would make configure fail if this is the last instruction. -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -+fi - -diff -up xloadimage.4.1/Makefile.in.png-pkg-config xloadimage.4.1/Makefile.in ---- xloadimage.4.1/Makefile.in.png-pkg-config 2012-11-27 14:57:17.419047158 -0500 -+++ xloadimage.4.1/Makefile.in 2012-11-27 14:57:17.480047158 -0500 -@@ -4,10 +4,10 @@ - - CC = @CC@ - DEFS = @DEFS@ -DSYSPATHFILE=\"/etc/X11/Xloadimage\" --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ @PNG_CFLAGS@ - XLIB = @X_LIBS@ -lX11 @X_EXTRA_LIBS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ @PNG_LIBS@ - - SRCS = bright.c clip.c cmuwmraster.c compress.c config.c \ - dither.c faces.c fbm.c fill.c gif.c halftone.c imagetypes.c img.c jpeg.c \ diff --git a/xloadimage-4.1-sub-second-delay.patch b/xloadimage-4.1-sub-second-delay.patch deleted file mode 100644 index 50a88b5..0000000 --- a/xloadimage-4.1-sub-second-delay.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up xloadimage.4.1/options.c.sub-second-delay xloadimage.4.1/options.c ---- xloadimage.4.1/options.c.sub-second-delay 2013-01-02 13:23:23.726173587 -0500 -+++ xloadimage.4.1/options.c 2013-01-02 13:23:37.706185351 -0500 -@@ -720,7 +720,7 @@ void processOptions(argc, argv, rglobal, - - continue; - #else /* !NO_DELAY */ -- newopt->info.delay= getInteger(DELAY, argv[a]); -+ newopt->info.delay= getFloat(DELAY, argv[a]); - break; - #endif /* !NO_DELAY */ - -diff -up xloadimage.4.1/options.h.sub-second-delay xloadimage.4.1/options.h ---- xloadimage.4.1/options.h.sub-second-delay 2013-01-02 13:25:44.297294626 -0500 -+++ xloadimage.4.1/options.h 2013-01-02 13:26:25.338329430 -0500 -@@ -49,7 +49,7 @@ typedef struct option { - unsigned int x, y, w, h; /* area of image to be used */ - } clip; - unsigned int colors; /* max # of colors to use for this image */ -- unsigned int delay; /* # of seconds delay before auto pic advance */ -+ double delay; /* # of seconds delay before auto pic advance */ - char *display; /* display name */ - struct { - char *type; /* image type */ -diff -up xloadimage.4.1/window.c.sub-second-delay xloadimage.4.1/window.c ---- xloadimage.4.1/window.c.sub-second-delay 2013-01-02 13:24:13.903216792 -0500 -+++ xloadimage.4.1/window.c 2013-01-02 13:25:35.928287337 -0500 -@@ -583,9 +583,9 @@ char imageInWindow(disp, scrn, image, gl - install= (getOption(global_options, INSTALL) != NULL); - private_cmap= (getOption(global_options, PRIVATE) != NULL); - if ((opt= getOption(image_options, DELAY))) -- delay= opt->info.delay; -+ delay= opt->info.delay*1000000; - else if ((opt= getOption(global_options, DELAY))) -- delay= opt->info.delay; -+ delay= opt->info.delay*1000000; - else - delay= 0; - if ((opt= getOption(image_options, VISUAL))) -@@ -872,7 +872,10 @@ char imageInWindow(disp, scrn, image, gl - #ifdef ENABLE_TIMEOUT - AlarmWentOff = 0; - signal(SIGALRM, delayAlarmHandler); -- alarm(delay); -+ if (delay > 999999) -+ alarm(delay/1000000); -+ else -+ ualarm(delay,0); - #endif /* ENABLE_TIMEOUT */ - } - diff --git a/xloadimage-c99.patch b/xloadimage-c99.patch deleted file mode 100644 index 6cbf5df..0000000 --- a/xloadimage-c99.patch +++ /dev/null @@ -1,165 +0,0 @@ -Add missing ints in old-style function definitions, to avoid build -failures with a strict(er) C99 compilers. - -The change to tiffIdent actually fixes a pointer clipping bug -because the missing types are not ints. - -There's also a #include , needed for calling the exit function. - -diff --git a/faces.c b/faces.c -index 3a2900e9a0030721..50c1077fa3456afd 100644 ---- a/faces.c -+++ b/faces.c -@@ -85,6 +85,7 @@ static int nextInt(zf, len) - - Image *facesLoad(fullname, name, verbose) - char *fullname, *name; -+ int verbose; - { ZFILE *zf; - Image *image; - char fname[BUFSIZ]; -diff --git a/options.c b/options.c -index 2fea7c5c1bd77d34..5edb2d29a086bddd 100644 ---- a/options.c -+++ b/options.c -@@ -425,6 +425,7 @@ static int getInteger(type, s) - } - - static float getFloat(type, s) -+ int type; - char *s; - { - float ret; -diff --git a/rlelib.c b/rlelib.c -index e729f6bddf08da20..0265c46c3ae888d7 100644 ---- a/rlelib.c -+++ b/rlelib.c -@@ -424,6 +424,7 @@ register struct sv_globals * globals; - */ - void - RunSkipBlankLines(nblank, globals) -+int nblank; - register struct sv_globals * globals; - { - } -@@ -435,6 +436,7 @@ register struct sv_globals * globals; - */ - void - RunSetColor(c, globals) -+int c; - register struct sv_globals * globals; - { - } -@@ -447,6 +449,7 @@ register struct sv_globals * globals; - /* ARGSUSED */ - void - RunSkipPixels(nskip, last, wasrun, globals) -+int nskip, last, wasrun; - register struct sv_globals * globals; - { - } -@@ -458,6 +461,7 @@ register struct sv_globals * globals; - */ - void - RunNewScanLine(flag, globals) -+int flag; - register struct sv_globals * globals; - { - } -@@ -469,6 +473,7 @@ register struct sv_globals * globals; - void - Runputdata(buf, n, globals) - rle_pixel * buf; -+int n; - register struct sv_globals * globals; - { - } -@@ -481,6 +486,7 @@ register struct sv_globals * globals; - /* ARGSUSED */ - void - Runputrun(color, n, last, globals) -+int color, n, last; - register struct sv_globals * globals; - { - } -@@ -1387,6 +1393,7 @@ int dith_size = 16; - */ - void - dithermap( levels, gamma, rgbmap, divN, modN, magic ) -+int levels; - double gamma; - int rgbmap[][3]; - int divN[256]; -@@ -1447,6 +1454,7 @@ int magic[16][16]; - */ - void - bwdithermap( levels, gamma, bwmap, divN, modN, magic ) -+int levels; - double gamma; - int bwmap[]; - int divN[256]; -@@ -1670,6 +1678,7 @@ int gammamap[256]; - * see "Note:" in dithermap comment. - */ - int dithergb( x, y, r, g, b, levels, divN, modN, magic ) -+int x, y, r, g, b, levels; - int divN[256]; - int modN[256]; - int magic[16][16]; -@@ -1700,6 +1709,7 @@ int magic[16][16]; - * see "Note:" in bwdithermap comment. - */ - int ditherbw( x, y, val, divN, modN, magic ) -+int x, y, val; - int divN[256]; - int modN[256]; - int magic[16][16]; -diff --git a/smooth.c b/smooth.c -index c61085b4df73a4f8..f11c682223739917 100644 ---- a/smooth.c -+++ b/smooth.c -@@ -74,6 +74,7 @@ static Image *doSmooth(image) - - Image *smooth(image, iterations, verbose) - Image *image; -+ int iterations; - unsigned int verbose; - { int a; - Image *old, *new; -diff --git a/tiff.c b/tiff.c -index 4c5649c91fb37d5c..b5e4722787440c83 100644 ---- a/tiff.c -+++ b/tiff.c -@@ -223,6 +223,8 @@ static void babble(name, info) - } - - int tiffIdent(fullname, name) -+char *fullname; -+char *name; - { - TIFF *tiff; - struct tiff_info info; -diff --git a/uufilter.c b/uufilter.c -index 72e20b200e9a06d7..e2b951602343efce 100644 ---- a/uufilter.c -+++ b/uufilter.c -@@ -11,6 +11,7 @@ - */ - - #include -+#include - #include - - int main(argc, argv) -diff --git a/xloadimage.c b/xloadimage.c -index cbb44d1d1e2a179c..938137aaa4269789 100644 ---- a/xloadimage.c -+++ b/xloadimage.c -@@ -46,6 +46,7 @@ static byte root_weave_bits[] = { - static Image *doProcessOnImage(image, option, verbose) - Image *image; - Option *option; -+ int verbose; - { Image *retimage= image; - XColor xcolor; /* color for foreground/background */ - diff --git a/xloadimage.spec b/xloadimage.spec index 35b8aff..0d3a750 100644 --- a/xloadimage.spec +++ b/xloadimage.spec @@ -1,10 +1,11 @@ Name: xloadimage Summary: Image viewer and processor Version: 4.1 -Release: 43%{?dist} +Release: 5%{?dist} License: MIT +Group: User Interface/X Source0: ftp://ftp.x.org/R5contrib/%{name}.%{version}.tar.gz -# Patches with number prefix come from Debian +# All of these patches come from Debian 4.1-16.1 # Many thanks to all those who have done work on this package over the years Patch0: 01_libjpeg-support.dpatch Patch1: 02_png-support.dpatch @@ -25,30 +26,10 @@ Patch15: 16_CAN-2005-0639.dpatch Patch16: 17_security-sprintf.dpatch Patch17: 18_manpage_fixes.dpatch Patch18: 19_fix_root_c_resource_leak.dpatch -Patch19: xloadimage-4.1-ignore-dummy-copyright-variables.patch -Patch20: xloadimage-4.1-bracketfix.patch -Patch21: xloadimage-4.1-png-pkg-config.patch -Patch22: xloadimage-4.1-libtiff4.patch -Patch23: xloadimage-4.1-png-1.5.patch -Patch24: xloadimage-4.1-fix-mem-leak.patch -Patch25: xloadimage-4.1-sub-second-delay.patch -Patch26: xloadimage-c99.patch -Patch27: 22-include.patch -Patch28: 27_shrink-should-not-zoom-upwards.patch -Patch29: 28_correct-scaling-fullscreen.patch -Patch30: 29_fix-manpage-hyphens.patch -Patch31: 32_fix-spelling.patch -# There is no real upstream for xloadimage anymore, so this work probably stays here forever. -Patch32: xloadimage-4.1-c23.patch + URL: http://www.frostbytes.com/~jimf/xloadimage.html -%if 0%{?fedora} >= 18 -BuildRequires: gcc -BuildRequires: libtiff-devel >= 4.0 -%else -BuildRequires: libtiff-devel -%endif -BuildRequires: make -BuildRequires: libX11-devel, libpng-devel, libjpeg-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libX11-devel, libtiff-devel, libpng-devel, libjpeg-devel BuildRequires: libICE-devel %description @@ -66,42 +47,25 @@ dithered automatically). %prep %setup -q -n %{name}.%{version} -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P5 -p1 -%patch -P6 -p1 -%patch -P7 -p1 -%patch -P8 -p1 -%patch -P9 -p1 -%patch -P10 -p1 -%patch -P11 -p1 -%patch -P12 -p1 -%patch -P13 -p1 -%patch -P14 -p1 -%patch -P15 -p1 -%patch -P16 -p1 -%patch -P17 -p1 -%patch -P18 -p1 -%patch -P19 -p1 -%patch -P20 -p1 -%patch -P21 -p1 -b .png-pkg-config -%if 0%{?fedora} >= 18 -%patch -P22 -p1 -b .tiff4 -%endif -%patch -P23 -p1 -b .png15 -%patch -P24 -p1 -b .fix-mem-leak -%patch -P25 -p1 -b .sub-second-delay -%patch -P26 -p1 -%patch -P27 -p1 -%patch -P28 -p1 -%patch -P29 -p1 -%patch -P30 -p1 -%patch -P31 -p1 -%patch -P32 -p1 -b .c23 - +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 chmod +x configure %build @@ -109,6 +73,7 @@ chmod +x configure make %{?_smp_mflags} %install +rm -rf %{buildroot} # First, the binaries: mkdir -p %{buildroot}%{_bindir} install -m 0755 uufilter %{buildroot}%{_bindir} @@ -130,7 +95,11 @@ install -m 0644 uufilter.man %{buildroot}%{_mandir}/man1/uufilter.1x cp -a %{buildroot}%{_mandir}/man1/xloadimage.1x %{buildroot}%{_mandir}/man1/xsetbg.1x cp -a %{buildroot}%{_mandir}/man1/xloadimage.1x %{buildroot}%{_mandir}/man1/xview.1x +%clean +rm -rf %{buildroot} + %files +%defattr(-,root,root,-) %doc README mit.cpyrght %{_bindir}/uufilter %{_bindir}/xloadimage @@ -140,124 +109,6 @@ cp -a %{buildroot}%{_mandir}/man1/xloadimage.1x %{buildroot}%{_mandir}/man1/xvie %{_mandir}/man1/* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 4.1-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 4.1-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 4.1-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Feb 24 2025 Tom Callaway - 4.1-40 -- bring over more Debian patches -- apply a lot of cleanups for c23 support - -* Sun Jan 19 2025 Fedora Release Engineering - 4.1-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 4.1-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 4.1-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 4.1-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 4.1-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Nov 27 2022 Florian Weimer - 4.1-34 -- Port to strict(er) C99 compilers (#2148739) - -* Sat Jul 23 2022 Fedora Release Engineering - 4.1-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 4.1-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.1-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 4.1-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 4.1-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 4.1-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 4.1-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 4.1-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 4.1-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 4.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 4.1-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.1-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 4.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 4.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 4.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 4.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 4.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 4.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 4.1-14 -- rebuild due to "jpeg8-ABI" feature drop - -* Wed Jan 2 2013 Tom Callaway - 4.1-13 -- fix memory leak caused by opening a lot of files at once then cycling through them with "N" -- enable support for sub-second-delay values -- thanks to Roger Heflin for both patches - -* Tue Nov 27 2012 Tom Callaway - 4.1-12 -- fix png 1.5 support - -* Sun Jul 22 2012 Fedora Release Engineering - 4.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon May 7 2012 Tom Callaway - 4.1-10 -- build against libtiff 4 (on Fedora 18+) - -* Sat Jan 14 2012 Fedora Release Engineering - 4.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Dec 08 2011 Tom Callaway - 4.1-8 -- fix configure and Makefile.in to use pkg-config info on libpng - -* Tue Dec 06 2011 Adam Jackson - 4.1-7 -- Rebuild for new libpng - -* Tue Jun 28 2011 Tom Callaway - 4.1-6 -- comment out unused copyright variables -- add missing bracket in C_ARITH_CODING_SUPPORTED conditional in jpeg.c - * Mon Feb 07 2011 Fedora Release Engineering - 4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild