do not hardcode the pkg-config command

diff --git a/SDL/Makefile.am b/SDL/Makefile.am
index 99dd540180f38423ddd8b04cc2beac99b5123249..c66d443a5672f2029fbc6caf0a4fa060065bb0b8 100644 (file)
--- a/SDL/Makefile.am
+++ b/SDL/Makefile.am
@@ -8,10 +8,10 @@ EXTRA_DIST = $(sdl_DATA)
 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= `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags` 
-SDL_LIBS= `export PKG_CONFIG_PATH=.; pkg-config sdl --libs`
+ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; $(PKG_CONFIG) zziplib --cflags` 
+ZZIP_LIBS= `export PKG_CONFIG_PATH=../zzip; $(PKG_CONFIG) zziplib --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)
 

diff --git a/configure.ac b/configure.ac
index 9d45f34b7dc5f2d8c6282e3fd257241048c3722a..64ca049c8d5c6916966334f4ed437bc8a887b980 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -261,7 +261,7 @@ AC_ARG_ENABLE(sdl, AC_HELP_STRING(
 if test "$enable_sdl" = "no" ; then
    AC_MSG_RESULT([no, disabled])
 else
-   enable_sdl=`pkg-config --modversion sdl 2>/dev/null`
+   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"