Skip to content

Commit

Permalink
Thu Feb 1 12:29:23 CET 2007 Paolo Molaro <lupus@ximian.com>
Browse files Browse the repository at this point in the history
	* 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
  • Loading branch information
illupus committed Feb 1, 2007
1 parent 6427326 commit cd8c21e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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-*-*)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mint.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@
2 changes: 1 addition & 1 deletion mono-uninstalled.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@
2 changes: 1 addition & 1 deletion mono.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@

0 comments on commit cd8c21e

Please sign in to comment.