From e18dc99bf4296bb600654a988d9f27eba2d8849a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 22 Jan 2012 23:20:50 -0500 Subject: [PATCH] Switched from SDL_image to SDL2_image --- Makefile.am | 24 +++--- Makefile.in | 99 +++++++++++++------------ SDL_image.pc.in => SDL2_image.pc.in | 6 +- SDL_image.spec.in => SDL2_image.spec.in | 4 +- aclocal.m4 | 99 ------------------------- configure | 8 +- configure.in | 6 +- 7 files changed, 74 insertions(+), 172 deletions(-) rename SDL_image.pc.in => SDL2_image.pc.in (71%) rename SDL_image.spec.in => SDL2_image.spec.in (96%) diff --git a/Makefile.am b/Makefile.am index 90bfb914..577b84bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,16 @@ # Makefile.am for the SDL sample image loading library and viewer -lib_LTLIBRARIES = libSDL_image.la +lib_LTLIBRARIES = libSDL2_image.la -libSDL_imageincludedir = $(includedir)/SDL -libSDL_imageinclude_HEADERS = \ +libSDL2_imageincludedir = $(includedir)/SDL2 +libSDL2_imageinclude_HEADERS = \ SDL_image.h if USE_IMAGEIO IMAGEIO_SOURCE = IMG_ImageIO.m endif -libSDL_image_la_SOURCES = \ +libSDL2_image_la_SOURCES = \ IMG.c \ IMG_bmp.c \ IMG_gif.c \ @@ -37,34 +37,34 @@ EXTRA_DIST = \ Xcode-iOS \ IMG_xxx.c \ IMG_UIImage.m \ - SDL_image.spec \ + SDL2_image.spec \ gcc-fat.sh \ autogen.sh if USE_VERSION_RC -libSDL_image_la_LDFLAGS = \ +libSDL2_image_la_LDFLAGS = \ -no-undefined \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o -libSDL_image_la_LIBADD = $(IMG_LIBS) -libSDL_image_la_DEPENDENCIES = version.o +libSDL2_image_la_LIBADD = $(IMG_LIBS) +libSDL2_image_la_DEPENDENCIES = version.o else -libSDL_image_la_LDFLAGS = \ +libSDL2_image_la_LDFLAGS = \ -no-undefined \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libSDL_image_la_LIBADD = $(IMG_LIBS) +libSDL2_image_la_LIBADD = $(IMG_LIBS) endif pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = SDL_image.pc +pkgconfig_DATA = SDL2_image.pc %.o : %.rc $(WINDRES) $< $@ noinst_PROGRAMS = showimage -showimage_LDADD = libSDL_image.la +showimage_LDADD = libSDL2_image.la # Rule to build tar-gzipped distribution package $(PACKAGE)-$(VERSION).tar.gz: distcheck diff --git a/Makefile.in b/Makefile.in index 5f80696d..5d59e6af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,14 +37,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@USE_VERSION_RC_FALSE@libSDL_image_la_DEPENDENCIES = \ +@USE_VERSION_RC_FALSE@libSDL2_image_la_DEPENDENCIES = \ @USE_VERSION_RC_FALSE@ $(am__DEPENDENCIES_1) noinst_PROGRAMS = showimage$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) \ - $(libSDL_imageinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/SDL_image.pc.in \ - $(srcdir)/SDL_image.spec.in $(top_srcdir)/configure COPYING \ + $(libSDL2_imageinclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/SDL2_image.pc.in \ + $(srcdir)/SDL2_image.spec.in $(top_srcdir)/configure COPYING \ config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \ @@ -59,7 +59,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = SDL_image.spec SDL_image.pc +CONFIG_CLEAN_FILES = SDL2_image.spec SDL2_image.pc am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -67,26 +67,27 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(libSDL_imageincludedir)" + "$(DESTDIR)$(libSDL2_imageincludedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__libSDL_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c IMG_jpg.c \ - IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c IMG_tif.c \ - IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c IMG_ImageIO.m +am__libSDL2_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c \ + IMG_jpg.c IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c \ + IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c \ + IMG_ImageIO.m @USE_IMAGEIO_TRUE@am__objects_1 = IMG_ImageIO.lo -am_libSDL_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \ +am_libSDL2_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \ IMG_lbm.lo IMG_pcx.lo IMG_png.lo IMG_pnm.lo IMG_tga.lo \ IMG_tif.lo IMG_xcf.lo IMG_xpm.lo IMG_xv.lo IMG_webp.lo \ $(am__objects_1) -libSDL_image_la_OBJECTS = $(am_libSDL_image_la_OBJECTS) -libSDL_image_la_LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +libSDL2_image_la_OBJECTS = $(am_libSDL2_image_la_OBJECTS) +libSDL2_image_la_LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \ - $(libSDL_image_la_LDFLAGS) $(LDFLAGS) -o $@ + $(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(noinst_PROGRAMS) showimage_SOURCES = showimage.c showimage_OBJECTS = showimage.$(OBJEXT) -showimage_DEPENDENCIES = libSDL_image.la +showimage_DEPENDENCIES = libSDL2_image.la DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,12 +109,12 @@ OBJCLD = $(OBJC) OBJCLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libSDL_image_la_SOURCES) showimage.c -DIST_SOURCES = $(am__libSDL_image_la_SOURCES_DIST) showimage.c +SOURCES = $(libSDL2_image_la_SOURCES) showimage.c +DIST_SOURCES = $(am__libSDL2_image_la_SOURCES_DIST) showimage.c pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) -libSDL_imageincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libSDL_imageinclude_HEADERS) +libSDL2_imageincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(libSDL2_imageinclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -262,13 +263,13 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -lib_LTLIBRARIES = libSDL_image.la -libSDL_imageincludedir = $(includedir)/SDL -libSDL_imageinclude_HEADERS = \ +lib_LTLIBRARIES = libSDL2_image.la +libSDL2_imageincludedir = $(includedir)/SDL2 +libSDL2_imageinclude_HEADERS = \ SDL_image.h @USE_IMAGEIO_TRUE@IMAGEIO_SOURCE = IMG_ImageIO.m -libSDL_image_la_SOURCES = \ +libSDL2_image_la_SOURCES = \ IMG.c \ IMG_bmp.c \ IMG_gif.c \ @@ -295,26 +296,26 @@ EXTRA_DIST = \ Xcode-iOS \ IMG_xxx.c \ IMG_UIImage.m \ - SDL_image.spec \ + SDL2_image.spec \ gcc-fat.sh \ autogen.sh -@USE_VERSION_RC_FALSE@libSDL_image_la_LDFLAGS = \ +@USE_VERSION_RC_FALSE@libSDL2_image_la_LDFLAGS = \ @USE_VERSION_RC_FALSE@ -no-undefined \ @USE_VERSION_RC_FALSE@ -release $(LT_RELEASE) \ @USE_VERSION_RC_FALSE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -@USE_VERSION_RC_TRUE@libSDL_image_la_LDFLAGS = \ +@USE_VERSION_RC_TRUE@libSDL2_image_la_LDFLAGS = \ @USE_VERSION_RC_TRUE@ -no-undefined \ @USE_VERSION_RC_TRUE@ -release $(LT_RELEASE) \ @USE_VERSION_RC_TRUE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o -@USE_VERSION_RC_FALSE@libSDL_image_la_LIBADD = $(IMG_LIBS) -@USE_VERSION_RC_TRUE@libSDL_image_la_LIBADD = $(IMG_LIBS) -@USE_VERSION_RC_TRUE@libSDL_image_la_DEPENDENCIES = version.o +@USE_VERSION_RC_FALSE@libSDL2_image_la_LIBADD = $(IMG_LIBS) +@USE_VERSION_RC_TRUE@libSDL2_image_la_LIBADD = $(IMG_LIBS) +@USE_VERSION_RC_TRUE@libSDL2_image_la_DEPENDENCIES = version.o pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = SDL_image.pc -showimage_LDADD = libSDL_image.la +pkgconfig_DATA = SDL2_image.pc +showimage_LDADD = libSDL2_image.la all: all-am .SUFFIXES: @@ -352,9 +353,9 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -SDL_image.spec: $(top_builddir)/config.status $(srcdir)/SDL_image.spec.in +SDL2_image.spec: $(top_builddir)/config.status $(srcdir)/SDL2_image.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ -SDL_image.pc: $(top_builddir)/config.status $(srcdir)/SDL_image.pc.in +SDL2_image.pc: $(top_builddir)/config.status $(srcdir)/SDL2_image.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -383,8 +384,8 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libSDL_image.la: $(libSDL_image_la_OBJECTS) $(libSDL_image_la_DEPENDENCIES) - $(libSDL_image_la_LINK) -rpath $(libdir) $(libSDL_image_la_OBJECTS) $(libSDL_image_la_LIBADD) $(LIBS) +libSDL2_image.la: $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_DEPENDENCIES) + $(libSDL2_image_la_LINK) -rpath $(libdir) $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ @@ -486,22 +487,22 @@ uninstall-pkgconfigDATA: echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ done -install-libSDL_imageincludeHEADERS: $(libSDL_imageinclude_HEADERS) +install-libSDL2_imageincludeHEADERS: $(libSDL2_imageinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libSDL_imageincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libSDL_imageincludedir)" - @list='$(libSDL_imageinclude_HEADERS)'; for p in $$list; do \ + test -z "$(libSDL2_imageincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libSDL2_imageincludedir)" + @list='$(libSDL2_imageinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(libSDL_imageincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libSDL_imageincludedir)/$$f'"; \ - $(libSDL_imageincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libSDL_imageincludedir)/$$f"; \ + echo " $(libSDL2_imageincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libSDL2_imageincludedir)/$$f'"; \ + $(libSDL2_imageincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libSDL2_imageincludedir)/$$f"; \ done -uninstall-libSDL_imageincludeHEADERS: +uninstall-libSDL2_imageincludeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(libSDL_imageinclude_HEADERS)'; for p in $$list; do \ + @list='$(libSDL2_imageinclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libSDL_imageincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libSDL_imageincludedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(libSDL2_imageincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(libSDL2_imageincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -580,7 +581,7 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -755 -exec chmod u+rwx,go+rx {} \; -o \ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -681,7 +682,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libSDL_imageincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libSDL2_imageincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -730,7 +731,7 @@ info: info-am info-am: -install-data-am: install-libSDL_imageincludeHEADERS \ +install-data-am: install-libSDL2_imageincludeHEADERS \ install-pkgconfigDATA install-dvi: install-dvi-am @@ -770,7 +771,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-libLTLIBRARIES \ - uninstall-libSDL_imageincludeHEADERS uninstall-pkgconfigDATA + uninstall-libSDL2_imageincludeHEADERS uninstall-pkgconfigDATA .MAKE: install-am install-strip @@ -784,13 +785,13 @@ uninstall-am: uninstall-libLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-libLTLIBRARIES \ - install-libSDL_imageincludeHEADERS install-man install-pdf \ + install-libSDL2_imageincludeHEADERS install-man install-pdf \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-libSDL_imageincludeHEADERS \ + uninstall-libLTLIBRARIES uninstall-libSDL2_imageincludeHEADERS \ uninstall-pkgconfigDATA diff --git a/SDL_image.pc.in b/SDL2_image.pc.in similarity index 71% rename from SDL_image.pc.in rename to SDL2_image.pc.in index 6f3853d4..ddb938f0 100644 --- a/SDL_image.pc.in +++ b/SDL2_image.pc.in @@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: SDL_image +Name: @PACKAGE@ Description: image loading library for Simple DirectMedia Layer Version: @VERSION@ -Requires: sdl >= @SDL_VERSION@ -Libs: -L${libdir} -lSDL_image +Requires: sdl2 >= @SDL_VERSION@ +Libs: -L${libdir} -lSDL2_image Cflags: -I${includedir}/SDL diff --git a/SDL_image.spec.in b/SDL2_image.spec.in similarity index 96% rename from SDL_image.spec.in rename to SDL2_image.spec.in index 9c07708f..a42ffcad 100644 --- a/SDL_image.spec.in +++ b/SDL2_image.spec.in @@ -12,7 +12,7 @@ Group: System Environment/Libraries BuildRoot: /var/tmp/%{name}-buildroot Prefix: %{_prefix} Packager: Hakan Tandogan -#BuildRequires: SDL-devel +#BuildRequires: SDL2-devel #BuildRequires: libjpeg-devel #BuildRequires: libpng-devel #BuildRequires: libtiff-devel @@ -25,7 +25,7 @@ This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats. Summary: Libraries, includes and more to develop SDL applications. Group: Development/Libraries Requires: %{name} -Requires: SDL-devel +Requires: SDL2-devel %description devel This is a simple library to load images of various formats as SDL surfaces. diff --git a/aclocal.m4 b/aclocal.m4 index 0137080d..95826278 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -16,105 +16,6 @@ m4_if(m4_PACKAGE_VERSION, [2.61],, You have another version of autoconf. If you want to use that, you should regenerate the build system entirely.], [63])]) -# 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, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/configure b/configure index bf05c065..bd6921ed 100755 --- a/configure +++ b/configure @@ -11102,7 +11102,7 @@ fi # Define the identity of the package. - PACKAGE=SDL_image + PACKAGE=SDL2_image VERSION=$VERSION @@ -15014,7 +15014,7 @@ LIBS="$saved_LIBS" OBJCFLAGS=$CFLAGS # Finally create all the generated files -ac_config_files="$ac_config_files Makefile SDL_image.spec SDL_image.pc" +ac_config_files="$ac_config_files Makefile SDL2_image.spec SDL2_image.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15888,8 +15888,8 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "SDL_image.spec") CONFIG_FILES="$CONFIG_FILES SDL_image.spec" ;; - "SDL_image.pc") CONFIG_FILES="$CONFIG_FILES SDL_image.pc" ;; + "SDL2_image.spec") CONFIG_FILES="$CONFIG_FILES SDL2_image.spec" ;; + "SDL2_image.pc") CONFIG_FILES="$CONFIG_FILES SDL2_image.pc" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/configure.in b/configure.in index 9bcfc1ab..75dc7947 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ dnl Detect the canonical build and host environments AC_CANONICAL_HOST dnl Setup for automake -AM_INIT_AUTOMAKE(SDL_image, $VERSION) +AM_INIT_AUTOMAKE(SDL2_image, $VERSION) dnl Check for tools AC_PROG_LIBTOOL @@ -377,6 +377,6 @@ OBJCFLAGS=$CFLAGS # Finally create all the generated files AC_OUTPUT([ Makefile -SDL_image.spec -SDL_image.pc +SDL2_image.spec +SDL2_image.pc ])