From 8117bc593929b50f5f55402eae68b0bd7e4350ef Mon Sep 17 00:00:00 2001
From: sauwming <ming@teluu.com>
Date: Wed, 4 Dec 2024 12:16:34 +0800
Subject: [PATCH] Fixed warnings of duplicate libs (#4177)

---
 aconfigure    | 5 ++---
 aconfigure.ac | 5 ++---
 build.mak.in  | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/aconfigure b/aconfigure
index b5d3446319..8714b57bd6 100755
--- a/aconfigure
+++ b/aconfigure
@@ -7064,7 +7064,7 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
                 CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS"
-                LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS"
+                LDFLAGS="$LDFLAGS $UPNP_LDFLAGS"
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -8566,7 +8566,6 @@ printf "%s\n" "not found" >&6; }
             ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
             ac_sdl_ldflags=`$SDL_CONFIG --libs`
             ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'`
-            LIBS="$LIBS $ac_sdl_ldflags"
         else
             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
 printf "%s\n" "Unsupported SDL version" >&6; }
@@ -9231,7 +9230,7 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
                 ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS"
-                ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS"
+                ac_vpx_ldflags="$VPX_LDFLAGS"
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
diff --git a/aconfigure.ac b/aconfigure.ac
index 279870e9d6..e70dec807f 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -750,7 +750,7 @@ AC_ARG_ENABLE(upnp,
             ],
             [
                 CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS"
-                LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS"
+                LDFLAGS="$LDFLAGS $UPNP_LDFLAGS"
                 AC_MSG_RESULT(yes)
             ],
             [
@@ -1546,7 +1546,6 @@ AC_ARG_ENABLE(sdl,
             ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
             ac_sdl_ldflags=`$SDL_CONFIG --libs`
             ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'`
-            LIBS="$LIBS $ac_sdl_ldflags"
         else
             AC_MSG_RESULT([Unsupported SDL version])
         fi
@@ -1806,7 +1805,7 @@ AC_ARG_ENABLE(vpx,
             ],
             [
                 ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS"
-                ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS"
+                ac_vpx_ldflags="$VPX_LDFLAGS"
                 AC_MSG_RESULT(yes)
             ],
             [
diff --git a/build.mak.in b/build.mak.in
index 3955a8930c..336cc6a272 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -331,7 +331,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
         $(PJLIB_LDLIB) \
         @LIBS@
 export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
-        -lstdc++ \
         $(APP_LDLIBS)
 
 # Here are the variables to use if application is using the library