ruby-changes:32178
From: nobu <ko1@a...>
Date: Tue, 17 Dec 2013 14:29:33 +0900 (JST)
Subject: [ruby-changes:32178] nobu:r44257 (trunk): configure.in: move opt-dir option
nobu 2013-12-17 14:29:17 +0900 (Tue, 17 Dec 2013) New Revision: 44257 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44257 Log: configure.in: move opt-dir option * configure.in (opt-dir): move so that it can affect in configure not only after rbconfig.rb. Modified files: trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 44256) +++ configure.in (revision 44257) @@ -856,6 +856,25 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/configure.in#L856 done fi +AC_ARG_WITH(opt-dir, + AS_HELP_STRING([--with-opt-dir=DIR-LIST], + [add optional headers and libraries directories separated by $PATH_SEPARATOR]), + [ + withval="$1" + val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"` + CPPFLAGS="$CPPFLAGS $val" + val=`IFS="$PATH_SEPARATOR" + for dir in $withval; do + echo x ${LIBPATHFLAG} ${RPATHFLAG} | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" + done | tr '\012' ' '` + LDFLAGS_OPTDIR="$val" + test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " + LDFLAGS="$LDFLAGS$val" + test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS " + DLDFLAGS="$DLDFLAGS$val" + ]) + test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\"" test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\"" @@ -2736,24 +2755,6 @@ AC_SUBST(RPATHFLAG) https://github.com/ruby/ruby/blob/trunk/configure.in#L2755 AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}") AC_SUBST(TRY_LINK) -AC_ARG_WITH(opt-dir, - AS_HELP_STRING([--with-opt-dir=DIR-LIST], - [add optional headers and libraries directories separated by $PATH_SEPARATOR]), - [ - val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"` - CPPFLAGS="$CPPFLAGS $val" - val=`IFS="$PATH_SEPARATOR" - for dir in $withval; do - echo x ${LIBPATHFLAG} ${RPATHFLAG} | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" - done | tr '\012' ' '` - LDFLAGS_OPTDIR="$val" - test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " - LDFLAGS="$LDFLAGS$val" - test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS " - DLDFLAGS="$DLDFLAGS$val" - ]) - AS_CASE(["$target_cpu-$target_os"], [*-darwin*], [ AC_CHECK_HEADERS([execinfo.h]) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/