From 6eb88c83424c1dfaa10bbb7aea08b8c41d75ea27 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <[EMAIL REDACTED]>
Date: Sat, 17 Jul 2021 16:06:21 +0100
Subject: [PATCH] Include required libraries in pkg-config output
---
Makefile.in | 4 ++++
SDL_net.pc.in | 4 +++-
configure | 23 +++++++++++++++++++++++
configure.ac | 19 +++++++++++++++++++
4 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 1aa802c..6ac1d58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,6 +205,10 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ENABLE_SHARED_FALSE = @ENABLE_SHARED_FALSE@
+ENABLE_SHARED_TRUE = @ENABLE_SHARED_TRUE@
+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
diff --git a/SDL_net.pc.in b/SDL_net.pc.in
index b68055e..4bf7cfb 100644
--- a/SDL_net.pc.in
+++ b/SDL_net.pc.in
@@ -7,5 +7,7 @@ Name: SDL_net
Description: net library for Simple DirectMedia Layer
Version: @VERSION@
Requires: sdl >= @SDL_VERSION@
-Libs: -L${libdir} -lSDL_net
+@ENABLE_SHARED_TRUE@Libs: -L${libdir} -lSDL_net
+@ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@Libs.private: @INETLIB@
+@ENABLE_SHARED_FALSE@Libs: -L${libdir} -lSDL_net @INETLIB@
Cflags: -I${includedir}/SDL
diff --git a/configure b/configure
index 1bb017a..8edff08 100755
--- a/configure
+++ b/configure
@@ -772,6 +772,10 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+ENABLE_STATIC_FALSE
+ENABLE_STATIC_TRUE
+ENABLE_SHARED_FALSE
+ENABLE_SHARED_TRUE
HAVE_GUI_LIB_FALSE
HAVE_GUI_LIB_TRUE
SDL_CONFIG
@@ -15803,6 +15807,25 @@ fi
CXXFLAGS="$CXXFLAGS $CFLAGS"
+if test x$enable_shared = xyes; then
+ ENABLE_SHARED_TRUE=
+ ENABLE_SHARED_FALSE="#"
+else
+ ENABLE_SHARED_TRUE="#"
+ ENABLE_SHARED_FALSE=
+fi
+if test x$enable_static = xyes; then
+ ENABLE_STATIC_TRUE=
+ ENABLE_STATIC_FALSE="#"
+else
+ ENABLE_STATIC_TRUE="#"
+ ENABLE_STATIC_FALSE=
+fi
+
+
+
+
+
# Finally create all the generated files
diff --git a/configure.ac b/configure.ac
index 9df6cb9..34decb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,25 @@ AM_CONDITIONAL(HAVE_GUI_LIB, test x$have_GUI = xyes)
dnl C++ flags are the same as the C flags
CXXFLAGS="$CXXFLAGS $CFLAGS"
+if test x$enable_shared = xyes; then
+ ENABLE_SHARED_TRUE=
+ ENABLE_SHARED_FALSE="#"
+else
+ ENABLE_SHARED_TRUE="#"
+ ENABLE_SHARED_FALSE=
+fi
+if test x$enable_static = xyes; then
+ ENABLE_STATIC_TRUE=
+ ENABLE_STATIC_FALSE="#"
+else
+ ENABLE_STATIC_TRUE="#"
+ ENABLE_STATIC_FALSE=
+fi
+AC_SUBST(ENABLE_SHARED_TRUE)
+AC_SUBST(ENABLE_SHARED_FALSE)
+AC_SUBST(ENABLE_STATIC_TRUE)
+AC_SUBST(ENABLE_STATIC_FALSE)
+
AC_SUBST([WINDRES])
# Finally create all the generated files