Thu Feb 1 12:29:23 CET 2007 Paolo Molaro <lupus@ximian.com>

	* configure.in: include LIBS in libmono_ldflags on all archs.
	* mint.pc.in, mono-uninstalled.pc.in, mono.pc.in: removed extra -lm.

svn path=/trunk/mono/; revision=72083

diff --git a/ChangeLog b/ChangeLog
index c4aa70141ac0db9a76e41fefe7ba090cbfee38cf..d0ef8903adee7f94b2b8bff17c1b0116600e3d46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Feb 1 12:29:23 CET 2007 Paolo Molaro <lupus@ximian.com>
+
+       * configure.in: include LIBS in libmono_ldflags on all archs.
+       * mint.pc.in, mono-uninstalled.pc.in, mono.pc.in: removed extra -lm.
+
 2007-02-01  Miguel de Icaza  <miguel@novell.com>
 
        * configure.in: Naive attempt at getting -ldl in mono.pc

diff --git a/configure.in b/configure.in
index 0452ff5bdd7923eea319b53755ffcca94b17a43e..0fb0fc3ba32c02af36bfb1db12ef4805e687f42e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -238,7 +238,6 @@ case "$host" in
                libdl="-ldl"
                ;;
 esac
-libmono_ldflags="$libmono_ldflags $libdl"
 AC_MSG_RESULT(ok)
 
 if test x$need_link_unlink = xyes; then
@@ -1622,7 +1621,6 @@ case "$host" in
                        # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
                        have_visibility_hidden=no
 
-                       libmono_ldflags="$libmono_ldflags $LIBS"
                esac
                ;;
        x86_64-*-* | amd64-*-*)
@@ -1656,7 +1654,6 @@ case "$host" in
                  *)
                        LIBC="libc.so"
                        INTL="libintl.so"
-                       libmono_ldflags="$libmono_ldflags $LIBS"
                esac
                jit_wanted=true
                if test x"$GCC" = xyes; then
@@ -1913,6 +1910,8 @@ AC_ARG_WITH(preview, [ --with-preview=yes,no     If you want to install the 2.0
        fi
 ])
 
+libmono_ldflags="$libmono_ldflags $LIBS"
+
 AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
 
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)

diff --git a/mint.pc.in b/mint.pc.in
index f62055fde6b57c093d64f3759ee39da5b630c21b..0b91a2c117cd61ee8ce347186833221bcfb639fe 100644 (file)
--- a/mint.pc.in
+++ b/mint.pc.in
@@ -8,5 +8,5 @@ Name: Mono Interpreter
 Description: Mono Interpreter Runtime
 Version: @VERSION@
 Requires: glib-2.0 gthread-2.0
-Libs: -L${libdir} @export_ldflags@ -lmint @libmono_ldflags@ -lm
+Libs: -L${libdir} @export_ldflags@ -lmint @libmono_ldflags@
 Cflags: -I${includedir} @libmono_cflags@

diff --git a/mono-uninstalled.pc.in b/mono-uninstalled.pc.in
index 2025cd9d1667315ce354bf743b14d4c20c0af91b..7fa3f12dc91e67dde44f98ebdec99cc8e4fe0d91 100644 (file)
--- a/mono-uninstalled.pc.in
+++ b/mono-uninstalled.pc.in
@@ -2,5 +2,5 @@ Name: Mono
 Description: Mono Runtime
 Version: @VERSION@
 Requires: glib-2.0 gthread-2.0
-Libs: -L@mono_build_root@/mono/mini/.libs @export_ldflags@ -lmono @libmono_ldflags@ -lm
+Libs: -L@mono_build_root@/mono/mini/.libs @export_ldflags@ -lmono @libmono_ldflags@
 Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/mono @libmono_cflags@

diff --git a/mono.pc.in b/mono.pc.in
index 349995e0a6db9fa8d83788b0d461d05b0ee08901..9374c192d757a3ea08ea9578f66316fc59b17e8c 100644 (file)
--- a/mono.pc.in
+++ b/mono.pc.in
@@ -7,5 +7,5 @@ Name: Mono
 Description: Mono Runtime
 Version: @VERSION@
 Requires: glib-2.0 gthread-2.0
-Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@ -lm
+Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
 Cflags: -I${includedir} @libmono_cflags@