Merge patches for libart static to source repository

pull/3/head
Timothy Pearson 13 years ago
parent c1509e19fc
commit 74cd36bb1e

@ -1,38 +0,0 @@
Add --static support to libart2-config --libs to avoid -lm
Debian #375812, GNOME #531278
Index: libart-config.in
===================================================================
--- libart-config.in (revision 280)
+++ libart-config.in (working copy)
@@ -3,6 +3,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
+libs=""
+output_libs=no
usage="\
Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
@@ -43,8 +45,11 @@ while test $# -gt 0; do
echo $includes
;;
--libs)
- libdirs=-L@libdir@
- echo $libdirs -lart_lgpl_2 -lm
+ libs="$libs -L@libdir@ -lart_lgpl_2"
+ output_libs=yes
+ ;;
+ --static)
+ libs="$libs -lm"
;;
*)
echo "${usage}" 1>&2
@@ -54,3 +59,7 @@ while test $# -gt 0; do
shift
done
+if test $output_libs = yes ; then
+ echo $libs
+fi
+

@ -1,38 +0,0 @@
Add --static support to libart2-config --libs to avoid -lm
Debian #375812, GNOME #531278
Index: libart-config.in
===================================================================
--- libart-config.in (revision 280)
+++ libart-config.in (working copy)
@@ -3,6 +3,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
+libs=""
+output_libs=no
usage="\
Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
@@ -43,8 +45,11 @@ while test $# -gt 0; do
echo $includes
;;
--libs)
- libdirs=-L@libdir@
- echo $libdirs -lart_lgpl_2 -lm
+ libs="$libs -L@libdir@ -lart_lgpl_2"
+ output_libs=yes
+ ;;
+ --static)
+ libs="$libs -lm"
;;
*)
echo "${usage}" 1>&2
@@ -54,3 +59,7 @@ while test $# -gt 0; do
shift
done
+if test $output_libs = yes ; then
+ echo $libs
+fi
+

@ -1,38 +0,0 @@
Add --static support to libart2-config --libs to avoid -lm
Debian #375812, GNOME #531278
Index: libart-config.in
===================================================================
--- libart-config.in (revision 280)
+++ libart-config.in (working copy)
@@ -3,6 +3,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
+libs=""
+output_libs=no
usage="\
Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
@@ -43,8 +45,11 @@ while test $# -gt 0; do
echo $includes
;;
--libs)
- libdirs=-L@libdir@
- echo $libdirs -lart_lgpl_2 -lm
+ libs="$libs -L@libdir@ -lart_lgpl_2"
+ output_libs=yes
+ ;;
+ --static)
+ libs="$libs -lm"
;;
*)
echo "${usage}" 1>&2
@@ -54,3 +59,7 @@ while test $# -gt 0; do
shift
done
+if test $output_libs = yes ; then
+ echo $libs
+fi
+
Loading…
Cancel
Save