- don't link with libstdc++ while using stlport.

Changed files:
    stlport-config.in -> 1.4
    stlport-debug.pc.in -> 1.4
    stlport.pc.in -> 1.3

diff --git a/stlport-config.in b/stlport-config.in
index e800933646e05f3cba67058af4e6e8eeb533da6b..c41783510077ad3244d91284394a06eaa3d1884e 100644 (file)
--- a/stlport-config.in
+++ b/stlport-config.in
@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
 exec_prefix_set=yes
 
 usage="\
-Usage: stlport-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+Usage: stlport-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
 
 if test $# -eq 0; then
       echo "${usage}" 1>&2
@@ -39,12 +39,12 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      includes="-I@includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 "
+      includes="-pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport "
       echo $includes
       ;;
     --libs)
       libdirs=-L@libdir@
-      echo $libdirs -lstlport -lpthread -lstdc++ -lm
+      echo -lc -nodefaultlibs $libdirs -lstlport
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/stlport-debug.pc.in b/stlport-debug.pc.in
index 48707922f24a194bb131444f198e27429d0d5820..44b23a4bbce35a0de9914d1a9f949e91ba90d1f3 100644 (file)
--- a/stlport-debug.pc.in
+++ b/stlport-debug.pc.in
@@ -6,5 +6,5 @@ Name: STLport
 Description: SGI STLPort with debug support
 Version: @ver@
 Requires:
-Libs: -L@libdir@ -lstlportstlg -lpthread -lstdc++ -lm
-Cflags: -I@includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+Libs: -nodefaultlibs -L@libdir@ -lc -lstlportstlg
+Cflags: -pthread -D_STLP_DEBUG -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport

diff --git a/stlport.pc.in b/stlport.pc.in
index 500c22df4bdd524b18cdcb3132b96e105ff91a8e..46bfef0b77b63edc81119aa386d48b24d742d6f2 100644 (file)
--- a/stlport.pc.in
+++ b/stlport.pc.in
@@ -6,5 +6,5 @@ Name: STLport
 Description: SGI STLPort
 Version: @ver@
 Requires:
-Libs: -L@libdir@ -lstlport -lpthread -lstdc++ -lm
-Cflags: -I@includedir@/stlport -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+Libs: -nodefaultlibs -L@libdir@ -lc -lstlport
+Cflags: -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -isystem @includedir@/stlport