diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,8 @@ -Sat May 19 11:34:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat May 19 11:35:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in (LIBEXT): add macro. + + * configure.in (ENCOBJS, EXTOBJS): use LIBEXT, not hardcoded suffix. * Makefile.in (LIBRUBY_A): fix typo. re-applying r35242. diff --git a/Makefile.in b/Makefile.in index dd9143b339..9322d9abb7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,6 +84,7 @@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@ RUBY_RELEASE_DATE=@RUBY_RELEASE_DATE@ EXEEXT = @EXEEXT@ +LIBEXT = @LIBEXT@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) RUBY = $(RUBY_INSTALL_NAME) MINIRUBY = @MINIRUBY@\ diff --git a/configure.in b/configure.in index 3e157cacda..1d020e8333 100644 --- a/configure.in +++ b/configure.in @@ -2420,8 +2420,8 @@ AC_ARG_WITH(static-linked-ext, AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]), [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])]) if test x"$EXTSTATIC" = xstatic; then - ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.a enc/libtrans.a' - EXTOBJS='ext/extinit.$(OBJEXT) ext/libext.a' + ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)' + EXTOBJS='ext/extinit.$(OBJEXT) ext/libext.$(LIBEXT)' AC_DEFINE_UNQUOTED(EXTSTATIC, 1) fi AC_SUBST(ENCOBJS) |