From 25d55404d0023d6aaccf6343fbb36dabbc41536f Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Sun, 4 Apr 2010 23:09:35 +0000 Subject: [PATCH] fix sdl-notfound problems --- ChangeLog | 5 +++++ Makefile.am | 5 +++-- Makefile.in | 5 +++-- configure | 6 +++--- configure.ac | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d401d0..6b072ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-04-05 guidod + * Makefile.am: fix "osc rm" and fix "test-sdl" if SDL was not found. + * configure.ac: SDL example builds on pkgconfig/sdl.pc which + was introduced with SDL 1.2.11 - CentOs5 ships 1.2.10 which + does only have "sdl-config" and it made for a mismatch in + in the build configuration: sdl-devel yes, pkgconfig sdl no. * zzip/zip.c (__zzip_parse_root_directory): move the check for zzip_disk_entry_check_magic to be after the the check that the seek-value is more than a header's size before the end. diff --git a/Makefile.am b/Makefile.am index 67f050d..7f427e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,7 @@ osc-ci osc-commit upload-osc: osc-copy ; ls $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/*.tar.* \ | { while read f; do tarname=`basename $$f` \ ; if test "$$tarname" != "$$tarball" \ - ; then echo osc rm $$f ; osc rm $$f \ + ; then echo osc rm -f $$f ; osc rm -f $$f \ ; else echo osc add $$f ; osc add $$f \ ; fi ; done } osc status $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/ @@ -69,7 +69,8 @@ upload-sourceforge www: (cd docs && $(MAKE) `basename $@`) sdl testsdl test-sdl install-sdl : - (cd SDL && $(MAKE) `basename $@`) + if test -z "$(SDL)"; then echo "skip $@ (no SDL)"; else \ + (cd SDL && $(MAKE) `basename $@`) ; fi check-test0 check-test1 check-zzdir check-zzcat \ check-zzxor check-zzxordir check-zzxorcat \ diff --git a/Makefile.in b/Makefile.in index 588317f..f0619ff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -836,7 +836,7 @@ osc-ci osc-commit upload-osc: osc-copy ; ls $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/*.tar.* \ | { while read f; do tarname=`basename $$f` \ ; if test "$$tarname" != "$$tarball" \ - ; then echo osc rm $$f ; osc rm $$f \ + ; then echo osc rm -f $$f ; osc rm -f $$f \ ; else echo osc add $$f ; osc add $$f \ ; fi ; done } osc status $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/ @@ -867,7 +867,8 @@ upload-sourceforge www: (cd docs && $(MAKE) `basename $@`) sdl testsdl test-sdl install-sdl : - (cd SDL && $(MAKE) `basename $@`) + if test -z "$(SDL)"; then echo "skip $@ (no SDL)"; else \ + (cd SDL && $(MAKE) `basename $@`) ; fi check-test0 check-test1 check-zzdir check-zzcat \ check-zzxor check-zzxordir check-zzxorcat \ diff --git a/configure b/configure index 7af8f4d..6a59a84 100755 --- a/configure +++ b/configure @@ -16227,10 +16227,10 @@ if test "$enable_sdl" = "no" ; then { $as_echo "$as_me:$LINENO: result: no, disabled" >&5 $as_echo "no, disabled" >&6; } else - enable_sdl=`sdl-config --version 2>/dev/null` + enable_sdl=`pkg-config --modversion sdl 2>/dev/null` case ".$enable_sdl" in - .1.*) { $as_echo "$as_me:$LINENO: result: yes, for SDL $enable_sdl" >&5 -$as_echo "yes, for SDL $enable_sdl" >&6; } + .1.*) { $as_echo "$as_me:$LINENO: result: yes, using SDL $enable_sdl" >&5 +$as_echo "yes, using SDL $enable_sdl" >&6; } SDL="SDL" ;; .2.*) { $as_echo "$as_me:$LINENO: result: yes, untested $enable_sdl" >&5 $as_echo "yes, untested $enable_sdl" >&6; } diff --git a/configure.ac b/configure.ac index 7a1e877..87adf87 100644 --- a/configure.ac +++ b/configure.ac @@ -256,9 +256,9 @@ AC_ARG_ENABLE(sdl, AC_HELP_STRING( if test "$enable_sdl" = "no" ; then AC_MSG_RESULT([no, disabled]) else - enable_sdl=`sdl-config --version 2>/dev/null` + enable_sdl=`pkg-config --modversion sdl 2>/dev/null` case ".$enable_sdl" in - .1.*) AC_MSG_RESULT([yes, for SDL $enable_sdl]) + .1.*) AC_MSG_RESULT([yes, using SDL $enable_sdl]) SDL="SDL" ;; .2.*) AC_MSG_RESULT([yes, untested $enable_sdl]) SDL="SDL" ;; -- 2.40.0