From 36c1de12f7d06b812d091abc3d4135ff01f450b9 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 27 May 2013 00:13:35 -0700 Subject: [PATCH] Renamed documentation files to .txt and converted them to DOS line endings so they would open properly on all systems. --- CHANGES => CHANGES.txt | 317 ++++++++++++++--------------------------- COPYING => COPYING.txt | 40 +++--- Makefile.am | 4 +- Makefile.in | 8 +- README => README.txt | 80 +++++------ aclocal.m4 | 99 +++++++++++++ configure | 2 +- configure.in | 2 +- 8 files changed, 276 insertions(+), 276 deletions(-) rename CHANGES => CHANGES.txt (53%) rename COPYING => COPYING.txt (97%) rename README => README.txt (97%) diff --git a/CHANGES b/CHANGES.txt similarity index 53% rename from CHANGES rename to CHANGES.txt index 4218b21f..e194f9fc 100644 --- a/CHANGES +++ b/CHANGES.txt @@ -1,208 +1,109 @@ -2.0.0: -Sam Lantinga - Sat Mar 23 13:36:51 PDT 2013 - * Fixed bug setting colorkey for indexed PNG images -Torsten Stremlau - Sun Mar 10 10:19:25 PDT 2013 - * Added support for alpha and lossless WEBP images - -1.2.12: -mscott - 2012-02-06 19:40:23 PST - * Fixed image corruption when using ImageIO framework -Sylvain - Thu Nov 22 13:09:59 PST 2012 - * Added extended XPM color table (disabled by default in IMG_xpm.c) -Sam Lantinga - Thu Jan 19 23:18:09 EST 2012 - * Fixed regression in 1.2.11 loading 8-bit PNG images with libpng - -1.2.11: -Sam Lantinga - Sat Jan 14 17:54:38 EST 2012 - * Fixed loading 8-bit PNG images on Mac OS X -Sam Lantinga - Sat Dec 31 09:35:40 EST 2011 - * SDL_image is now under the zlib license -Michael Bonfils - Mon Nov 28 21:46:00 EST 2011 - * Added WEBP image support -Thomas Klausner - Wed Jan 19 19:31:25 PST 2011 - * Fixed compiling with libpng 1.4 -Sam Lantinga - Mon Jan 10 12:09:57 2011 -0800 - * Added Android.mk to build on the Android platform -Sam Lantinga - Mon May 10 22:42:53 PDT 2010 - * Fixed loading HAM6 images with stencil mask -Mark Tucker - Fri, 27 Nov 2009 12:38:21 -0500 - * Fixed bug loading 15 and 16 bit BMP images - -1.2.10: -Sam Lantinga - Sat Nov 14 11:22:14 PST 2009 - * Fixed bug loading multiple images - -1.2.9: -Sam Lantinga - Tue Nov 10 00:29:20 PST 2009 - * Fixed alpha premultiplication on Mac OS X and iPhone OS -Sam Lantinga - Sun Nov 8 07:52:11 PST 2009 - * Fixed checking for IMG_Init() return value in image loaders - -1.2.8: -Sam Lantinga - Sun Oct 4 13:12:54 PDT 2009 - * Added support for uncompressed PCX files -Mason Wheeler - 2009-06-10 06:29:45 PDT - * Added IMG_Init()/IMG_Quit() to prevent constantly loading and unloading DLLs -Couriersud - Mon, 12 Jan 2009 17:21:13 -0800 - * Added support for ICO and CUR image files -Eric Wing - Fri, 2 Jan 2009 02:01:16 -0800 - * Added ImageIO loading infrastructure for Mac OS X - * Added UIImage loading infrastructure for iPhone / iPod Touch - -1.2.7: -Sam Lantinga - Sun Nov 2 15:08:27 PST 2008 - * Fixed buffer overflow in BMP loading code, discovered by j00ru//vx -Sam Lantinga - Fri Dec 28 08:34:54 PST 2007 - * Fixed buffer overflow in GIF loading code, discovered by Michael Skladnikiewicz - -1.2.6: -Sam lantinga - Wed Jul 18 00:30:32 PDT 2007 - * Improved detection of libjpeg, libpng, and libtiff at configure time - * PNG and TIFF images are correctly identified even if dynamic libraries - to load them aren't available. - * Fixed loading of TIFF images using libtiff 3.6 -Sam Lantinga - Thu Jul 5 07:52:35 2007 - * Fixed static linking with libjpeg -Michael Koch - Tue Feb 13 10:09:17 2007 - * Fixed crash in IMG_ReadXPMFromArray() - -1.2.5: -Maurizio Monge - Sun May 14 13:57:32 PDT 2006 - * Fixed loading BMP palettes at unusual offsets -Sam Lantinga - Thu May 11 21:51:19 PDT 2006 - * Added support for dynamically loading libjpeg, libpng, and libtiff. -Sam Lantinga - Sun Apr 30 01:48:40 PDT 2006 - * Added gcc-fat.sh for generating Universal binaries on Mac OS X - * Updated libtool support to version 1.5.22 -Sam Lantinga - Sat Feb 4 15:17:44 PST 2006 - * Added support for XV thumbnail images -Gautier Portet - Fri, 19 Mar 2004 17:35:12 +0100 - * Added support for 32-bit BMP files with alpha - -1.2.4: -Pierre G. Richard - Fri, 30 Jul 2004 11:13:11 +0000 (UTC) - * Added support for RLE encoded BMP files -Marc Le Douarain - Fri, 26 Dec 2003 18:23:42 +0100 - * Added EHB and HAM mode support to the ILBM loader -Sam Lantinga - Wed Nov 19 00:23:44 PST 2003 - * Updated libtool support for new mingw32 DLL build process -Holger Schemel - Mon, 04 Aug 2003 21:50:52 +0200 - * Fixed crash loading certain PCX images -Kyle Davenport - Sat, 19 Apr 2003 17:13:31 -0500 - * Added .la files to the development RPM, fixing RPM build on RedHat 8 - -1.2.3: -Ryan C. Gordon - Sat, 8 Feb 2003 09:36:33 -0500 - * Fixed memory leak with non-seekable SDL_RWops -Marc Le Douarain - Sun, 22 Dec 2002 22:59:51 +0100 - * Added 24-bit support to the ILBM format loader -Sam Lantinga - Sun Oct 20 20:55:46 PDT 2002 - * Added shared library support for MacOS X -Pete Shinners - Thu Jun 20 10:05:54 PDT 2002 - * The JPEG loader can now load EXIF format JPEG images -Dag-Erling Smorgrav - Thu May 2 19:09:48 PDT 2002 - * The XCF loader now ignores invisible layers and channels - -1.2.2: -Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002 - * Updated autogen.sh for new versions of automake - * Specify the SDL API calling convention (C by default) -Mattias Engdegård - Fri Dec 28 17:54:31 PST 2001 - * Worked around exit() in the jpeg image library - -1.2.1: -Mattias Engdegård - Tue Nov 20 08:08:53 PST 2001 - * Fixed transparency in the GIF loading code -Daniel Morais - Sun Sep 23 16:32:13 PDT 2001 - * Added support for the IFF (LBM) image format -Sam Lantinga - Sun Aug 19 01:51:44 PDT 2001 - * Added Project Builder projects for building MacOS X framework -Mattias Engdegård - Tue Jul 31 04:32:29 PDT 2001 - * Fixed transparency in 8-bit PNG files -Mattias Engdegård - Sat Apr 28 11:30:22 PDT 2001 - * Added support for loading XPM image data directly -Paul Jenner - Sat, 14 Apr 2001 09:20:38 -0700 (PDT) - * Added support for building RPM directly from tar archive - -1.2.0: -Sam Lantinga - Wed Apr 4 12:42:20 PDT 2001 - * Synchronized release version with SDL 1.2.0 - -1.1.1: -Berni - Wed Mar 7 09:18:02 PST 2001 - * Added initial GIMP XCF support (disabled by default) -Mattias Engdegård - Wed Mar 7 09:01:49 PST 2001 - * Added general PNM (PPM/PGM/PBM) support -Mattias Engdegård - Sun Mar 4 14:23:42 PST 2001 - * Fixed bugs in PPM support, added ASCII PPM support -Mattias Engdegård - Fri Mar 2 14:48:09 PST 2001 - * Cleaned up some compiler warnings -Mattias Engdegård - Tue Feb 27 12:44:43 PST 2001 - * Improved the PCX loading code - * Modified showimage to set hardware palette for 8-bit displays -Robert Stein - Thu, 22 Feb 2001 14:26:19 -0600 - * Improved the PPM loading code -Sam Lantinga - Tue Jan 30 14:24:06 PST 2001 - * Modified showimage to accept multiple images on the command line -Sam Lantinga - Mon Dec 18 02:49:29 PST 2000 - * Added a Visual C++ project including JPEG and PNG loading support -Mattias Engdegård - Wed Dec 6 10:00:07 PST 2000 - * Improved the XPM loading code - -1.1.0: -Sam Lantinga - Wed Nov 29 00:46:27 PST 2000 - * Added XPM file format support - Supports color, greyscale, and mono XPMs with and without transparency -Mattias Engdegård - Thu, 2 Nov 2000 23:23:17 +0100 (MET) - * Fixed array overrun when loading an unsupported format - * Minor compilation fixes for various platforms - -1.0.10: -Mattias Engdegård - Wed Aug 9 20:32:22 MET DST 2000 - * Removed the alpha flipping, made IMG_InvertAlpha() a noop - * Fixed nonexisting PCX alpha support - * Some TIFF bugfixes - * PNG greyscale images are loaded as 8bpp with a greyscale palette -Ray Kelm - Fri, 04 Aug 2000 20:58:00 -0400 - * Added support for cross-compiling Windows DLL from Linux - -1.0.9: -Mattias Engdegård - Sat Jul 1 17:57:37 PDT 2000 - * PNG loader properly sets the colorkey on 8-bit transparent images -Mattias Engdegård - Sat Jul 1 13:24:47 PDT 2000 - * Fixed a bug in PCX detection - * Added support for TGA files - * showimage shows a checker background for transparent images - -1.0.8: -Mark Baker - Tue May 30 12:20:00 PDT 2000 - * Added TIFF format loading support - -1.0.7: -Mattias Engdegård - Sat May 27 14:18:33 PDT 2000 - * Added fixes for loading images on big-endian systems - -1.0.6: -Sam Lantinga - Sat Apr 29 10:18:32 PDT 2000 - * showimage puts the name of the image in the title bar caption -Sam Lantinga - Sat Apr 29 10:05:58 PDT 2000 - * Removed pitch check, since PNG already loads to a list of row pointers - -1.0.5: -Sam Lantinga - Sun Apr 23 14:41:32 PDT 2000 - * Added support for GIF transparency -Sam Lantinga - Wed Apr 12 14:39:20 PDT 2000 - * Fixed memory heap crash on NT using PNG images -Matt Campbell - Thu, 13 Apr 2000 13:29:17 -0700 - * Fixed PNG detection on some Linux systems - -1.0.4: -Sam Lantinga - Tue Feb 1 13:33:53 PST 2000 - * Cleaned up for Visual C++ - * Added Visual C++ project file - -1.0.3: -Sam Lantinga - Wed Jan 19 22:10:52 PST 2000 - * Added CHANGES - * Added rpm spec file contributed by Hakan Tandogan - * Changed the name of the example program from "show" to "showimage" +2.0.0: +Sam Lantinga - Sat Mar 23 13:36:51 PDT 2013 + * Fixed bug setting colorkey for indexed PNG images +Torsten Stremlau - Sun Mar 10 10:19:25 PDT 2013 + * Added support for alpha and lossless WEBP images + +1.2.12: +mscott - 2012-02-06 19:40:23 PST + * Fixed image corruption when using ImageIO framework +Sylvain - Thu Nov 22 13:09:59 PST 2012 + * Added extended XPM color table (disabled by default in IMG_xpm.c) +Sam Lantinga - Thu Jan 19 23:18:09 EST 2012 + * Fixed regression in 1.2.11 loading 8-bit PNG images with libpng + +1.2.11: +Sam Lantinga - Sat Jan 14 17:54:38 EST 2012 + * Fixed loading 8-bit PNG images on Mac OS X +Sam Lantinga - Sat Dec 31 09:35:40 EST 2011 + * SDL_image is now under the zlib license +Michael Bonfils - Mon Nov 28 21:46:00 EST 2011 + * Added WEBP image support +Thomas Klausner - Wed Jan 19 19:31:25 PST 2011 + * Fixed compiling with libpng 1.4 +Sam Lantinga - Mon Jan 10 12:09:57 2011 -0800 + * Added Android.mk to build on the Android platform +Sam Lantinga - Mon May 10 22:42:53 PDT 2010 + * Fixed loading HAM6 images with stencil mask +Mark Tucker - Fri, 27 Nov 2009 12:38:21 -0500 + * Fixed bug loading 15 and 16 bit BMP images + +1.2.10: +Sam Lantinga - Sat Nov 14 11:22:14 PST 2009 + * Fixed bug loading multiple images + +1.2.9: +Sam Lantinga - Tue Nov 10 00:29:20 PST 2009 + * Fixed alpha premultiplication on Mac OS X and iPhone OS +Sam Lantinga - Sun Nov 8 07:52:11 PST 2009 + * Fixed checking for IMG_Init() return value in image loaders + +1.2.8: +Sam Lantinga - Sun Oct 4 13:12:54 PDT 2009 + * Added support for uncompressed PCX files +Mason Wheeler - 2009-06-10 06:29:45 PDT + * Added IMG_Init()/IMG_Quit() to prevent constantly loading and unloading DLLs +Couriersud - Mon, 12 Jan 2009 17:21:13 -0800 + * Added support for ICO and CUR image files +Eric Wing - Fri, 2 Jan 2009 02:01:16 -0800 + * Added ImageIO loading infrastructure for Mac OS X + * Added UIImage loading infrastructure for iPhone / iPod Touch + +1.2.7: +Sam Lantinga - Sun Nov 2 15:08:27 PST 2008 + * Fixed buffer overflow in BMP loading code, discovered by j00ru//vx +Sam Lantinga - Fri Dec 28 08:34:54 PST 2007 + * Fixed buffer overflow in GIF loading code, discovered by Michael Skladnikiewicz + +1.2.6: +Sam lantinga - Wed Jul 18 00:30:32 PDT 2007 + * Improved detection of libjpeg, libpng, and libtiff at configure time + * PNG and TIFF images are correctly identified even if dynamic libraries + to load them aren't available. + * Fixed loading of TIFF images using libtiff 3.6 +Sam Lantinga - Thu Jul 5 07:52:35 2007 + * Fixed static linking with libjpeg +Michael Koch - Tue Feb 13 10:09:17 2007 + * Fixed crash in IMG_ReadXPMFromArray() + +1.2.5: +Maurizio Monge - Sun May 14 13:57:32 PDT 2006 + * Fixed loading BMP palettes at unusual offsets +Sam Lantinga - Thu May 11 21:51:19 PDT 2006 + * Added support for dynamically loading libjpeg, libpng, and libtiff. +Sam Lantinga - Sun Apr 30 01:48:40 PDT 2006 + * Added gcc-fat.sh for generating Universal binaries on Mac OS X + * Updated libtool support to version 1.5.22 +Sam Lantinga - Sat Feb 4 15:17:44 PST 2006 + * Added support for XV thumbnail images +Gautier Portet - Fri, 19 Mar 2004 17:35:12 +0100 + * Added support for 32-bit BMP files with alpha + +1.2.4: +Pierre G. Richard - Fri, 30 Jul 2004 11:13:11 +0000 (UTC) + * Added support for RLE encoded BMP files +Marc Le Douarain - Fri, 26 Dec 2003 18:23:42 +0100 + * Added EHB and HAM mode support to the ILBM loader +Sam Lantinga - Wed Nov 19 00:23:44 PST 2003 + * Updated libtool support for new mingw32 DLL build process +Holger Schemel - Mon, 04 Aug 2003 21:50:52 +0200 + * Fixed crash loading certain PCX images +Kyle Davenport - Sat, 19 Apr 2003 17:13:31 -0500 + * Added .la files to the development RPM, fixing RPM build on RedHat 8 + +1.2.3: +Ryan C. Gordon - Sat, 8 Feb 2003 09:36:33 -0500 + * Fixed memory leak with non-seekable SDL_RWops +Marc Le Douarain - Sun, 22 Dec 2002 22:59:51 +0100 + * Added 24-bit support to the ILBM format loader +Sam Lantinga - Sun Oct 20 20:55:46 PDT 2002 + * Added shared library support for MacOS X +Pete Shinners - Thu Jun 20 10:05:54 PDT 2002 + * The JPEG loader can now load EXIF format JPEG images +Dag-Erling Smorgrav - Thu May 2 19:09:48 PDT 2002 + * The XCF loader now ignores invisible layers and channels + +1.2.2: +Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002 + * Updated autogen.sh for new versions of automake + * Specify the SDL API calling convention (C by default) diff --git a/COPYING b/COPYING.txt similarity index 97% rename from COPYING rename to COPYING.txt index 0b7210d7..eed295df 100644 --- a/COPYING +++ b/COPYING.txt @@ -1,20 +1,20 @@ -/* - SDL_image: An example image loading library for use with SDL - Copyright (C) 1997-2013 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ +/* + SDL_image: An example image loading library for use with SDL + Copyright (C) 1997-2013 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ diff --git a/Makefile.am b/Makefile.am index 24522675..72f7f79a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,6 @@ libSDL2_image_la_SOURCES = \ EXTRA_DIST = \ Android.mk \ debian \ - CHANGES \ version.rc \ VisualC \ VisualCE \ @@ -40,7 +39,8 @@ EXTRA_DIST = \ IMG_UIImage.m \ SDL2_image.spec \ gcc-fat.sh \ - autogen.sh + autogen.sh \ + *.txt if USE_VERSION_RC libSDL2_image_la_LDFLAGS = \ diff --git a/Makefile.in b/Makefile.in index d7510201..6b2cd8e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,8 +62,8 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/SDL2_image.spec.in $(srcdir)/SDL2_image.pc.in \ - depcomp $(libSDL2_imageinclude_HEADERS) COPYING README \ - config.guess config.sub install-sh missing ltmain.sh + depcomp $(libSDL2_imageinclude_HEADERS) config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \ $(top_srcdir)/acinclude/ltoptions.m4 \ @@ -394,7 +394,6 @@ libSDL2_image_la_SOURCES = \ EXTRA_DIST = \ Android.mk \ debian \ - CHANGES \ version.rc \ VisualC \ VisualCE \ @@ -404,7 +403,8 @@ EXTRA_DIST = \ IMG_UIImage.m \ SDL2_image.spec \ gcc-fat.sh \ - autogen.sh + autogen.sh \ + *.txt @USE_VERSION_RC_FALSE@libSDL2_image_la_LDFLAGS = \ @USE_VERSION_RC_FALSE@ -no-undefined \ diff --git a/README b/README.txt similarity index 97% rename from README rename to README.txt index c9891782..77a7c104 100644 --- a/README +++ b/README.txt @@ -1,40 +1,40 @@ - -SDL_image 1.2 - -The latest version of this library is available from: -http://www.libsdl.org/projects/SDL_image/ - -This is a simple library to load images of various formats as SDL surfaces. -This library supports BMP, PNM (PPM/PGM/PBM), XPM, LBM, PCX, GIF, JPEG, PNG, -TGA, and TIFF formats. - -API: -#include "SDL_image.h" - - SDL_Surface *IMG_Load(const char *file); -or - SDL_Surface *IMG_Load_RW(SDL_RWops *src, int freesrc); -or - SDL_Surface *IMG_LoadTyped_RW(SDL_RWops *src, int freesrc, char *type); - -where type is a string specifying the format (i.e. "PNG" or "pcx"). -Note that IMG_Load_RW cannot load TGA images. - -To create a surface from an XPM image included in C source, use: - - SDL_Surface *IMG_ReadXPMFromArray(char **xpm); - -An example program 'showimage' is included, with source in showimage.c - -JPEG support requires the JPEG library: http://www.ijg.org/ -PNG support requires the PNG library: http://www.libpng.org/pub/png/libpng.html - and the Zlib library: http://www.gzip.org/zlib/ -TIFF support requires the TIFF library: ftp://ftp.sgi.com/graphics/tiff/ - -If you have these libraries installed in non-standard places, you can -try adding those paths to the configure script, e.g. -sh ./configure CPPFLAGS="-I/somewhere/include" LDFLAGS="-L/somewhere/lib" -If this works, you may need to add /somewhere/lib to your LD_LIBRARY_PATH -so shared library loading works correctly. - -This library is under the zlib License, see the file "COPYING" for details. + +SDL_image 1.2 + +The latest version of this library is available from: +http://www.libsdl.org/projects/SDL_image/ + +This is a simple library to load images of various formats as SDL surfaces. +This library supports BMP, PNM (PPM/PGM/PBM), XPM, LBM, PCX, GIF, JPEG, PNG, +TGA, and TIFF formats. + +API: +#include "SDL_image.h" + + SDL_Surface *IMG_Load(const char *file); +or + SDL_Surface *IMG_Load_RW(SDL_RWops *src, int freesrc); +or + SDL_Surface *IMG_LoadTyped_RW(SDL_RWops *src, int freesrc, char *type); + +where type is a string specifying the format (i.e. "PNG" or "pcx"). +Note that IMG_Load_RW cannot load TGA images. + +To create a surface from an XPM image included in C source, use: + + SDL_Surface *IMG_ReadXPMFromArray(char **xpm); + +An example program 'showimage' is included, with source in showimage.c + +JPEG support requires the JPEG library: http://www.ijg.org/ +PNG support requires the PNG library: http://www.libpng.org/pub/png/libpng.html + and the Zlib library: http://www.gzip.org/zlib/ +TIFF support requires the TIFF library: ftp://ftp.sgi.com/graphics/tiff/ + +If you have these libraries installed in non-standard places, you can +try adding those paths to the configure script, e.g. +sh ./configure CPPFLAGS="-I/somewhere/include" LDFLAGS="-L/somewhere/lib" +If this works, you may need to add /somewhere/lib to your LD_LIBRARY_PATH +so shared library loading works correctly. + +This library is under the zlib License, see the file "COPYING" for details. diff --git a/aclocal.m4 b/aclocal.m4 index e9b9a301..1781e6df 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,6 +20,105 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/configure b/configure index 0b64cb81..4ac971ee 100755 --- a/configure +++ b/configure @@ -731,7 +731,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= PACKAGE_URL= -ac_unique_file="README" +ac_unique_file="README.txt" # Factoring default headers for most tests. ac_includes_default="\ #include diff --git a/configure.in b/configure.in index 00f13312..949444be 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(README) +AC_INIT(README.txt) dnl Set various version strings - taken gratefully from the GTk sources