rename PKG_CONFIG_LIBS_PRIV to PKGCONFIG_LIBS_PRIV i.e.: do not steal PKG_CONFIG namespace.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c6d8e..4a20aba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2267,12 +2267,12 @@ if(NOT WINDOWS OR CYGWIN)
set(ENABLE_STATIC_FALSE "")
endif()
if(SDL_SHARED)
- set(PKG_CONFIG_LIBS_PRIV "
+ set(PKGCONFIG_LIBS_PRIV "
Libs.private:")
set(ENABLE_SHARED_TRUE "")
set(ENABLE_SHARED_FALSE "#")
else()
- set(PKG_CONFIG_LIBS_PRIV "")
+ set(PKGCONFIG_LIBS_PRIV "")
set(ENABLE_SHARED_TRUE "#")
set(ENABLE_SHARED_FALSE "")
endif()
diff --git a/configure b/configure
index c764f5c..65ed13a 100755
--- a/configure
+++ b/configure
@@ -648,7 +648,7 @@ ENABLE_STATIC_FALSE
ENABLE_STATIC_TRUE
ENABLE_SHARED_FALSE
ENABLE_SHARED_TRUE
-PKG_CONFIG_LIBS_PRIV
+PKGCONFIG_LIBS_PRIV
SDL_RLD_FLAGS
SDL_STATIC_LIBS
SDL_LIBS
@@ -26022,12 +26022,12 @@ SDL_STATIC_LIBS="$EXTRA_LDFLAGS"
if test x$enable_shared = xyes; then
- PKG_CONFIG_LIBS_PRIV="
+ PKGCONFIG_LIBS_PRIV="
Libs.private:"
ENABLE_SHARED_TRUE=
ENABLE_SHARED_FALSE="#"
else
- PKG_CONFIG_LIBS_PRIV=
+ PKGCONFIG_LIBS_PRIV=
ENABLE_SHARED_TRUE="#"
ENABLE_SHARED_FALSE=
fi
diff --git a/configure.ac b/configure.ac
index 43409b1..33dcd5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.59])
AC_INIT
AC_CONFIG_SRCDIR([src/SDL.c])
-AC_CONFIG_HEADERS(include/SDL_config.h)
-AC_CONFIG_AUX_DIR(build-scripts)
+AC_CONFIG_HEADERS([include/SDL_config.h])
+AC_CONFIG_AUX_DIR([build-scripts])
AC_CONFIG_MACRO_DIR([acinclude])
dnl Save the CFLAGS to see whether they were passed in or generated
@@ -4416,12 +4417,12 @@ AC_SUBST(SDL_LIBS)
AC_SUBST(SDL_STATIC_LIBS)
AC_SUBST(SDL_RLD_FLAGS)
if test x$enable_shared = xyes; then
- PKG_CONFIG_LIBS_PRIV="
+ PKGCONFIG_LIBS_PRIV="
Libs.private:"
ENABLE_SHARED_TRUE=
ENABLE_SHARED_FALSE="#"
else
- PKG_CONFIG_LIBS_PRIV=
+ PKGCONFIG_LIBS_PRIV=
ENABLE_SHARED_TRUE="#"
ENABLE_SHARED_FALSE=
fi
@@ -4432,7 +4433,7 @@ else
ENABLE_STATIC_TRUE="#"
ENABLE_STATIC_FALSE=
fi
-AC_SUBST(PKG_CONFIG_LIBS_PRIV)
+AC_SUBST(PKGCONFIG_LIBS_PRIV)
AC_SUBST(ENABLE_SHARED_TRUE)
AC_SUBST(ENABLE_SHARED_FALSE)
AC_SUBST(ENABLE_STATIC_TRUE)
diff --git a/sdl2.pc.in b/sdl2.pc.in
index 9d76d47..1b3c0db 100644
--- a/sdl2.pc.in
+++ b/sdl2.pc.in
@@ -10,5 +10,5 @@ Description: Simple DirectMedia Layer is a cross-platform multimedia library des
Version: @SDL_VERSION@
Requires:
Conflicts:
-Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @PKG_CONFIG_LIBS_PRIV@ @SDL_STATIC_LIBS@
+Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @PKGCONFIG_LIBS_PRIV@ @SDL_STATIC_LIBS@
Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@