ruby-changes:17635
From: nobu <ko1@a...>
Date: Sat, 30 Oct 2010 14:37:52 +0900 (JST)
Subject: [ruby-changes:17635] Ruby:r29643 (trunk): * configure.in (ruby_pc): erase runtime-defined variables and
nobu 2010-10-30 14:37:43 +0900 (Sat, 30 Oct 2010) New Revision: 29643 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29643 Log: * configure.in (ruby_pc): erase runtime-defined variables and check if generated pc file is valid. * template/ruby.pc.in (DEFFILE): need for mingw. * template/ruby.pc.in (LIBRUBY): fix the order. Modified files: trunk/ChangeLog trunk/configure.in trunk/template/ruby.pc.in Index: configure.in =================================================================== --- configure.in (revision 29642) +++ configure.in (revision 29643) @@ -359,6 +359,11 @@ AC_CHECK_TOOL(DOT, dot) AC_CHECK_TOOL(DOXYGEN, doxygen) +AC_CHECK_TOOL(PKG_CONFIG, pkg-config) +if test -n "$PKG_CONFIG"; then + $PKG_CONFIG --print-errors --version > /dev/null 2>&1 || PKG_CONFIG= +fi + # checks for UNIX variants that set C preprocessor variables AC_USE_SYSTEM_EXTENSIONS @@ -2811,10 +2816,19 @@ AC_SUBST(ruby_pc) AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in, [ - sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g'] $ruby_pc > ruby.pc.tmp && - mv -f ruby.pc.tmp $ruby_pc + if sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc && + { + test -z "$PKG_CONFIG" || + PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp + } + then + mv -f ruby.tmp.pc $ruby_pc + else + rm ruby.tmp.pc $ruby_pc + exit 1 + fi ], - [ruby_pc='$ruby_pc']) + [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG']) AC_OUTPUT dnl } Index: ChangeLog =================================================================== --- ChangeLog (revision 29642) +++ ChangeLog (revision 29643) @@ -1,3 +1,12 @@ +Sat Oct 30 14:37:39 2010 Nobuyoshi Nakada <nobu@r...> + + * configure.in (ruby_pc): erase runtime-defined variables and + check if generated pc file is valid. + + * template/ruby.pc.in (DEFFILE): need for mingw. + + * template/ruby.pc.in (LIBRUBY): fix the order. + Sat Oct 30 11:33:54 2010 Nobuyoshi Nakada <nobu@r...> * win32/Makefile.sub (ruby_pc): ignore missing variables. Index: template/ruby.pc.in =================================================================== --- template/ruby.pc.in (revision 29642) +++ template/ruby.pc.in (revision 29643) @@ -11,10 +11,11 @@ RUBY_BASE_NAME=@RUBY_BASE_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ +DEFFILE=@DEFFILE@ LIBPATH=@LIBPATH@ -LIBRUBY=@LIBRUBY@ LIBRUBY_A=@LIBRUBY_A@ LIBRUBY_SO=@LIBRUBY_SO@ +LIBRUBY=@LIBRUBY@ LIBRUBYARG_SHARED=@LIBRUBYARG_SHARED@ LIBRUBYARG_STATIC=@LIBRUBYARG_STATIC@ LIBRUBYARG=@LIBRUBYARG@ @@ -30,6 +31,7 @@ Name: Ruby Description: Object Oriented Script Language Version: ${ruby_version} +URL: http://www.ruby-lang.org Cflags: -I${rubyhdrdir}/${arch} -I${rubyhdrdir} Libs: ${DLDFLAGS} ${LIBRUBYARG_SHARED} ${LIBS} Requires: -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/