fix sdl-uninstalled.pc handling.

diff --git a/ChangeLog b/ChangeLog
index 6b072abb1c3cc2d185cf195dec77ab5f10fc12ea..58ca819b162e78ea599a93809b07c5d36c62556d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-08  guidod  <guidod@gmx.de>
+
+       * SDL/Makefile.am: fix generation of sdl-uninstalled.pc that was
+          not recognized during compilation.
+
 2010-04-05  guidod  <guidod@gmx.de>
 
        * Makefile.am: fix "osc rm" and fix "test-sdl" if SDL was not found.

diff --git a/Makefile.in b/Makefile.in
index f0619ff2da95932fb5cd570586434db5381fc5b5..d3a0bb110efd1fcab0f37a5f6968e8beef1c0549 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -200,6 +200,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@

diff --git a/SDL/Makefile.am b/SDL/Makefile.am
index 80a19f895d26ac1fa55fd99db88701c874dab34f..99dd540180f38423ddd8b04cc2beac99b5123249 100644 (file)
--- a/SDL/Makefile.am
+++ b/SDL/Makefile.am
@@ -10,8 +10,8 @@ check_PROGRAMS = zzcatsdl
 zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
 ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags` 
 ZZIP_LIBS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --libs`
-SDL_CFLAGS= `pkg-config sdl --cflags` 
-SDL_LIBS= `pkg-config sdl --libs`
+SDL_CFLAGS= `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags` 
+SDL_LIBS= `export PKG_CONFIG_PATH=.; pkg-config sdl --libs`
 CFLAGS= -I$(srcdir) $(ZZIP_CFLAGS) $(SDL_CFLAGS)
 LIBS= $(ZZIP_LIBS) $(SDL_LIBS)
 
@@ -26,6 +26,7 @@ testsdl test-sdl : test.zip zzcatsdl$(EXEEXT)
        ./zzcatsdl$(EXEEXT) test/README > test.out
        diff -q @top_srcdir@/README test.out && rm test.out
 
+all: @SDL_GENERATE@
 sdl : all
 install-sdl : install-data # and not the binary
 
@@ -45,3 +46,12 @@ SDL_rwops_zzip.pc : Makefile
        @ echo "Description: SDL_rwops for ZZipLib" >>$@
        echo 'Requires: sdl, zziplib' >>$@
        echo 'Cflags: -I$${zzipsdldir}' >>$@
+
+sdl-pc : sdl-uninstalled.pc
+sdl-uninstalled.pc : Makefile
+       @ echo "prefix=`sdl-config --prefix`" >$@
+       @ echo "Name: sdl" >>$@
+       @ echo "Version: `sdl-config --version`" >>$@
+       @ echo "Description: sdl - Simple DirectMedia Layer" >>$@
+       echo "Libs: `sdl-config --libs`" >> $@
+       echo "Cflags: `sdl-config --cflags`" >>$@

diff --git a/SDL/Makefile.in b/SDL/Makefile.in
index 8e7c5a7d51e63c6f61bfb9ac5bd653ec23a4b4c1..bcaaf80f12fc58cf58eb751ccfe9c18519af0368 100644 (file)
--- a/SDL/Makefile.in
+++ b/SDL/Makefile.in
@@ -193,6 +193,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -278,8 +279,8 @@ EXTRA_DIST = $(sdl_DATA)
 zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
 ZZIP_CFLAGS = `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags` 
 ZZIP_LIBS = `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --libs`
-SDL_CFLAGS = `pkg-config sdl --cflags` 
-SDL_LIBS = `pkg-config sdl --libs`
+SDL_CFLAGS = `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags` 
+SDL_LIBS = `export PKG_CONFIG_PATH=.; pkg-config sdl --libs`
 CLEANFILES = *.pc *.omf
 pkgconfig_HEADERS = SDL_rwops_zzip.pc
 ERRNULL = 2>/dev/null
@@ -622,6 +623,7 @@ testsdl test-sdl : test.zip zzcatsdl$(EXEEXT)
        ./zzcatsdl$(EXEEXT) test/README > test.out
        diff -q @top_srcdir@/README test.out && rm test.out
 
+all: @SDL_GENERATE@
 sdl : all
 install-sdl : install-data # and not the binary
 
@@ -635,6 +637,15 @@ SDL_rwops_zzip.pc : Makefile
        echo 'Requires: sdl, zziplib' >>$@
        echo 'Cflags: -I$${zzipsdldir}' >>$@
 
+sdl-pc : sdl-uninstalled.pc
+sdl-uninstalled.pc : Makefile
+       @ echo "prefix=`sdl-config --prefix`" >$@
+       @ echo "Name: sdl" >>$@
+       @ echo "Version: `sdl-config --version`" >>$@
+       @ echo "Description: sdl - Simple DirectMedia Layer" >>$@
+       echo "Libs: `sdl-config --libs`" >> $@
+       echo "Cflags: `sdl-config --cflags`" >>$@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/bins/Makefile.in b/bins/Makefile.in
index 737bae7aba0829ee806898a217e1bc5b01e01b71..55e57beb9621b6845ac7ab6330de02c32c2475dc 100644 (file)
--- a/bins/Makefile.in
+++ b/bins/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@

diff --git a/configure b/configure
index 6a59a84999110535abe13d6fe707303a109e9988..6989415071afd3a57f23fd74b468cdd9876ef1d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -798,6 +798,7 @@ PKG_CONFIG
 RESOLVES
 ZZIPLIB_LDFLAGS
 ZIPTESTS
+SDL_GENERATE
 SDL
 ZLIB_VERSION
 LARGEFILE_CFLAGS
@@ -5486,13 +5487,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5489: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5490: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5492: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5493: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5495: output\"" >&5)
+  (eval echo "\"\$as_me:5496: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6695,7 +6696,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6698 "configure"' > conftest.$ac_ext
+  echo '#line 6699 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8550,11 +8551,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8553: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8554: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8557: \$? = $ac_status" >&5
+   echo "$as_me:8558: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8889,11 +8890,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8892: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8893: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8896: \$? = $ac_status" >&5
+   echo "$as_me:8897: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8994,11 +8995,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8997: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8998: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9001: \$? = $ac_status" >&5
+   echo "$as_me:9002: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9049,11 +9050,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9052: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9053: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9056: \$? = $ac_status" >&5
+   echo "$as_me:9057: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11849,7 +11850,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11852 "configure"
+#line 11853 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11945,7 +11946,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11948 "configure"
+#line 11949 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16216,6 +16217,7 @@ esac
 { $as_echo "$as_me:$LINENO: checking whether making SDL parts" >&5
 $as_echo_n "checking whether making SDL parts... " >&6; }
 SDL=""
+SDL_GENERATE=""
 # Check whether --enable-sdl was given.
 if test "${enable_sdl+set}" = set; then
   enableval=$enable_sdl;
@@ -16228,6 +16230,14 @@ if test "$enable_sdl" = "no" ; then
 $as_echo "no, disabled" >&6; }
 else
    enable_sdl=`pkg-config --modversion sdl 2>/dev/null`
+   if test -z "$enable_sdl"; then
+      enable_sdl=`sdl-config --version 2>/dev/null`
+      SDL_GENERATE="sdl-uninstalled.pc"
+      enable_sdl="$enable_sdl (sdl-config)"
+   else
+      enable_sdl="$enable_sdl (pkgconfig)"
+   fi
+   enable_sdl="$enable_sdl."
    case ".$enable_sdl" in
      .1.*) { $as_echo "$as_me:$LINENO: result: yes, using SDL $enable_sdl" >&5
 $as_echo "yes, using SDL $enable_sdl" >&6; }
@@ -16238,8 +16248,13 @@ $as_echo "yes, untested $enable_sdl" >&6; }
      *)    { $as_echo "$as_me:$LINENO: result: no, $enable_sdl" >&5
 $as_echo "no, $enable_sdl" >&6; } ;;
    esac
+   if test -n "$SDL_GENERATE"; then
+      { $as_echo "$as_me:$LINENO: result: enabled SDL generation of... $SDL_GENERATE" >&5
+$as_echo "enabled SDL generation of... $SDL_GENERATE" >&6; }
+   fi
 fi
 
+
 # ---------------------------------------------------------------
 { $as_echo "$as_me:$LINENO: checking running extra tests on make check" >&5
 $as_echo_n "checking running extra tests on make check... " >&6; }

diff --git a/configure.ac b/configure.ac
index 87adf876d555b7010de2da39e39c63887aa3203d..751575336a89c159e0be26fb7d172d837a2da596 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -250,6 +250,7 @@ esac
 # ---------------------------------------------------------------
 AC_MSG_CHECKING(whether making SDL parts)
 SDL=""
+SDL_GENERATE=""
 AC_ARG_ENABLE(sdl, AC_HELP_STRING(
     [--enable-sdl],[enable SDL usage (if present)])
     ,,[enable_sdl="no"])
@@ -257,6 +258,14 @@ if test "$enable_sdl" = "no" ; then
    AC_MSG_RESULT([no, disabled])
 else
    enable_sdl=`pkg-config --modversion sdl 2>/dev/null`
+   if test -z "$enable_sdl"; then
+      enable_sdl=`sdl-config --version 2>/dev/null`
+      SDL_GENERATE="sdl-uninstalled.pc"
+      enable_sdl="$enable_sdl (sdl-config)"
+   else
+      enable_sdl="$enable_sdl (pkgconfig)"
+   fi
+   enable_sdl="$enable_sdl."
    case ".$enable_sdl" in
      .1.*) AC_MSG_RESULT([yes, using SDL $enable_sdl])
            SDL="SDL" ;;
@@ -264,8 +273,12 @@ else
            SDL="SDL" ;;
      *)    AC_MSG_RESULT([no, $enable_sdl]) ;;
    esac
+   if test -n "$SDL_GENERATE"; then
+      AC_MSG_RESULT([enabled SDL generation of... $SDL_GENERATE])
+   fi
 fi
-AC_SUBST(SDL)
+AC_SUBST([SDL])
+AC_SUBST([SDL_GENERATE])
 # ---------------------------------------------------------------
 AC_MSG_CHECKING(running extra tests on make check)
 if test "MKZIP" != ":" ; then

diff --git a/docs/Makefile.in b/docs/Makefile.in
index ef4882e3959b1d98b25b3b57e62ef5551fb932e6..f9ad9cac3526dbec36455e8da1b726aeb9ee2fe3 100644 (file)
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -145,6 +145,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @top_srcdir@/SDL
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@

diff --git a/test/Makefile.in b/test/Makefile.in
index bc9df562be797cbab715fe51a7083561679a2348..30033338dabc3f38af3c05200f3f6cabff616b2a 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -171,6 +171,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@

diff --git a/zzip/Makefile.in b/zzip/Makefile.in
index 1a324905d199656dd4f4a3a16d523c498083bb43..c7b98af38eb2bb454c93b908cd7a028c9ade7ef5 100644 (file)
--- a/zzip/Makefile.in
+++ b/zzip/Makefile.in
@@ -207,6 +207,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@

diff --git a/zzipwrap/Makefile.in b/zzipwrap/Makefile.in
index 1caa9451be18c169a709f22ccc5b51097c787db5..380e330fbb94adbbaca600642368bbb63c015b36 100644 (file)
--- a/zzipwrap/Makefile.in
+++ b/zzipwrap/Makefile.in
@@ -202,6 +202,7 @@ RANLIB = @RANLIB@
 RELEASE_INFO = @RELEASE_INFO@
 RESOLVES = @RESOLVES@
 SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@