File ruby-1.8.6.p286_autoreconf.patch of Package ruby
--- configure.orig 2008-08-07 22:05:36.000000000 -0400
+++ configure 2008-08-08 17:59:58.000000000 -0400
@@ -719,6 +719,7 @@
EXTOUT
ARCHFILE
RDOCTARGET
+HTMLTARGET
XCFLAGS
XLDFLAGS
LIBRUBY_LDSHARED
@@ -747,6 +748,7 @@
arch
sitearch
sitedir
+vendordir
configure_args
NROFF
MANTYPE
@@ -1359,6 +1361,7 @@
--disable-rpath embed run path into extension libraries.
--enable-shared build a shared library for Ruby.
--enable-install-doc build and install rdoc indexes during install
+ --enable-install-html-doc build and install rdoc html files during install
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1369,7 +1372,8 @@
--with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)
--with-dln-a-out use dln_a_out if possible
--with-static-linked-ext link external modules statically
- --with-sitedir=DIR site libraries in DIR PREFIX/lib/ruby/site_ruby
+ --with-sitedir=DIR site libraries in DIR [LIBDIR/ruby/site_ruby]
+ --with-vendordir=DIR vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]
--with-search-path=DIR specify the additional search path
--with-mantype=TYPE specify man page type; TYPE is one of man and doc
@@ -16357,7 +16357,7 @@
/* Test for whether ELF binaries are produced */
#include <fcntl.h>
#include <stdlib.h>
-main() {
+int main() {
char buffer[4];
int i=open("conftest",O_RDONLY);
if(i==-1)
@@ -16975,7 +16975,7 @@
/* end confdefs.h. */
#include <stdio.h>
-main ()
+int main ()
{
char buf[256];
sprintf (buf, "%g", 1e+300);
@@ -17042,7 +17042,7 @@
#include <stdio.h>
#include <math.h>
-main ()
+int main ()
{
char buf[256];
sprintf (buf, "%f", log(exp(1.0)));
@@ -17272,6 +17272,19 @@
fi
+HTMLTARGET=""
+# Check whether --enable-install-html-doc was given.
+if test "${enable_install_html_doc+set}" = set; then
+ enableval=$enable_install_html_doc; install_html=$enableval
+else
+ install_html=no
+fi
+
+if test "$install_html" != no; then
+ HTMLTARGET="install-html-doc"
+fi
+
+
case "$target_os" in
linux*)
XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
@@ -17422,32 +17435,29 @@
rubyw_install_name="$RUBYW_INSTALL_NAME"
;;
esac
-case "$target_os" in
- cygwin*|mingw*|*djgpp*|os2-emx*)
- RUBY_LIB_PREFIX="/lib/ruby"
- ;;
- *)
- RUBY_LIB_PREFIX="${prefix}/lib/ruby"
- ;;
-esac
-RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
# Check whether --with-sitedir was given.
if test "${with_sitedir+set}" = set; then
withval=$with_sitedir; sitedir=$withval
else
- sitedir='${prefix}/lib/ruby/site_ruby'
+ sitedir='${libdir}/ruby/site_ruby'
fi
SITE_DIR=`eval echo \\"${sitedir}\\"`
+
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)
- RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
- RUBY_SITE_LIB_PATH="$SITE_DIR";;
+ RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+ RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+ ;;
*)
- RUBY_SITE_LIB_PATH="$SITE_DIR";;
+ RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+ RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+ ;;
esac
+RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
cat >>confdefs.h <<_ACEOF
@@ -17464,6 +17474,34 @@
+# Check whether --with-vendordir was given.
+if test "${with_vendordir+set}" = set; then
+ withval=$with_vendordir; vendordir=$withval
+else
+ vendordir='${libdir}/ruby/vendor_ruby'
+fi
+
+VENDOR_DIR=`eval echo \\"${vendordir}\\"`
+case "$target_os" in
+ cygwin*|mingw*|*djgpp*|os2-emx*)
+ RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+ ;;
+ *)
+ RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+ ;;
+esac
+RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
+
+cat >>confdefs.h <<_ACEOF
+#define RUBY_VENDOR_LIB "${RUBY_VENDOR_LIB_PATH}"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define RUBY_VENDOR_LIB2 "${RUBY_VENDOR_LIB_PATH2}"
+_ACEOF
+
+
+
configure_args=$ac_configure_args
if test "$fat_binary" != no ; then
@@ -17479,6 +17517,10 @@
_ACEOF
cat >>confdefs.h <<_ACEOF
+#define RUBY_VENDOR_THIN_ARCHLIB "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
#define RUBY_PLATFORM __ARCHITECTURE__ "-${target_os}"
_ACEOF
@@ -17503,6 +17545,10 @@
#define RUBY_SITE_ARCHLIB "${RUBY_SITE_LIB_PATH2}/${sitearch}"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define RUBY_VENDOR_ARCHLIB "${RUBY_VENDOR_LIB_PATH2}/${sitearch}"
+_ACEOF
+
# Check whether --with-search-path was given.
@@ -17597,6 +17643,7 @@
tr -d '\015' < confdefs.h > config.h
fi
tr -d '\015' < largefile.h > confdefs.h
+rm largefile.h
ac_config_files="$ac_config_files $FIRSTMAKEFILE"
@@ -18385,6 +18432,7 @@
EXTOUT!$EXTOUT$ac_delim
ARCHFILE!$ARCHFILE$ac_delim
RDOCTARGET!$RDOCTARGET$ac_delim
+HTMLTARGET!$HTMLTARGET$ac_delim
XCFLAGS!$XCFLAGS$ac_delim
XLDFLAGS!$XLDFLAGS$ac_delim
LIBRUBY_LDSHARED!$LIBRUBY_LDSHARED$ac_delim
@@ -18413,13 +18461,14 @@
arch!$arch$ac_delim
sitearch!$sitearch$ac_delim
sitedir!$sitedir$ac_delim
+vendordir!$vendordir$ac_delim
configure_args!$configure_args$ac_delim
NROFF!$NROFF$ac_delim
MANTYPE!$MANTYPE$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
