[前][次][番号順一覧][スレッド一覧]

ruby-changes:50600

From: nobu <ko1@a...>
Date: Wed, 14 Mar 2018 23:07:06 +0900 (JST)
Subject: [ruby-changes:50600] nobu:r62749 (trunk): configure.ac: basic libs

nobu	2018-03-14 23:07:00 +0900 (Wed, 14 Mar 2018)

  New Revision: 62749

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62749

  Log:
    configure.ac: basic libs
    
    * configure.ac: basic libraries like -lm are necessary for some
      extension libraries on some platforms.

  Modified files:
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 62748)
+++ configure.ac	(revision 62749)
@@ -18,7 +18,6 @@ AC_DISABLE_OPTION_CHECKING https://github.com/ruby/ruby/blob/trunk/configure.ac#L18
 AC_ARG_VAR([cflags], [additional CFLAGS])
 AC_ARG_VAR([cppflags], [additional CPPFLAGS])
 AC_ARG_VAR([cxxflags], [additional CXXFLAGS])
-ORIG_LIBS=$LIBS
 
 { # environment section
 
@@ -716,13 +715,16 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L715
 dnl Checks for libraries.
 AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
 
+AS_UNSET(ORIG_LIBS)
 POSTLINK=:
 AC_SUBST(POSTLINK)
 AS_CASE(["$target_os"],
 [nextstep*], [	],
 [openstep*], [	],
 [rhapsody*], [	],
-[darwin*], [	RUBY_PREPEND_OPTION(LIBS, -lobjc)
+[darwin*], [
+		ORIG_LIBS="$LIBS"
+		RUBY_PREPEND_OPTION(LIBS, -lobjc)
 		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
 		AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
 		AC_TRY_CPP([#include <AvailabilityMacros.h>
@@ -959,6 +961,7 @@ main() https://github.com/ruby/ruby/blob/trunk/configure.ac#L961
 		ac_cv_func_round=no
 		],
 [	LIBS="-lm $LIBS"])
+: ${ORIG_LIBS=$LIBS}
 
 AC_CHECK_LIB(crypt, crypt)      # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]