Changeset 5803


Ignore:
Timestamp:
Aug 12, 2015 11:45:04 AM (7 years ago)
Author:
gah
Message:

test me

Location:
branches/r9
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/README

    r2079 r5803  
     1
    12
    23======================================================================
  • branches/r9/lang/cf/rpLangRuby.m4

    r4909 r5803  
    1616     --with-ruby-sitelibdir=PATH,
    1717     [ path to install ruby scripts [[auto-detect]] ]),
    18     [ ruby_sitelibdir=$withval ],
    19     [ ruby_sitelibdir=NONE ])
     18    [WITH_RUBY_SITELIBDIR=$withval],
     19    [WITH_RUBY_SITELIBDIR=""])
    2020
    2121echo RUBY=$WITH_RUBY
     
    3434AC_SUBST(RUBY)
    3535
    36 AC_DEFUN([RUBY_CONFIG], [
    37           $RUBY -rrbconfig -e "puts(Config::CONFIG[['$1']] || '')"])
     36. ${srcdir}/cf/rp_ruby_functions.sh
     37
     38#AC_DEFUN([RUBY_CONFIG], [
     39# $RUBY -rrbconfig -e "puts(RbConfig::CONFIG[['$1']])"])
    3840
    3941RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
    4042AC_SUBST(RUBY_VERSION_CODE)
    4143
    42 RUBY_CONFIG_SO_NAME=`RUBY_CONFIG(RUBY_SO_NAME)`
    43 RUBY_CONFIG_ARCHDIR=`RUBY_CONFIG(archdir)`
    44 RUBY_CONFIG_ARCH=`RUBY_CONFIG(arch)`
    45 RUBY_CONFIG_LIBDIR=`RUBY_CONFIG(libdir)`
    46 RUBY_CONFIG_BINDIR=`RUBY_CONFIG(bindir)`
    47 RUBY_CONFIG_RUBYHDRDIR=`RUBY_CONFIG(rubyhdrdir)`
    48 RUBY_CONFIG_CFLAGS=`RUBY_CONFIG(CFLAGS)`
    49 RUBY_CONFIG_LIBS=`RUBY_CONFIG(LIBS)`
    50 RUBY_CONFIG_DLDLIBS=`RUBY_CONFIG(DLDLIBS)`
    51 RUBY_CONFIG_LDFLAGS=`RUBY_CONFIG(LDFLAGS)`
    52 RUBY_CONFIG_LIBRUBYARG=`RUBY_CONFIG(LIBRUBYARG)`
    53 RUBY_CONFIG_LIBRUBYARG_STATIC=`RUBY_CONFIG(LIBRUBYARG_STATIC)`
    54 RUBY_CONFIG_CCDLFLAGS=`RUBY_CONFIG(CCDLFLAGS)`
     44RUBY_VERSION=`ruby_get_config_param "ruby_version"`
     45RUBY_CONFIG_ARCHDIR=`ruby_get_config_param "archdir"`
     46RUBY_CONFIG_ARCH=`ruby_get_config_param "arch"`
     47RUBY_CONFIG_LIBDIR=`ruby_get_config_param "libdir"`
     48RUBY_CONFIG_BINDIR=`ruby_get_config_param "bindir"`
     49RUBY_CONFIG_RUBYHDRDIR=`ruby_get_config_param rubyhdrdir`
     50RUBY_CONFIG_CFLAGS=`ruby_get_config_param CFLAGS`
     51RUBY_CONFIG_LIBS=`ruby_get_config_param LIBS`
     52RUBY_CONFIG_DLDLIBS=`ruby_get_config_param DLDLIBS`
     53RUBY_CONFIG_LDFLAGS=`ruby_get_config_param LDFLAGS`
     54RUBY_CONFIG_SITELIBDIR=`ruby_get_config_param sitelibdir`
     55RUBY_CONFIG_LIBRUBYARG=`ruby_get_config_param LIBRUBYARG`
     56RUBY_CONFIG_LIBRUBYARG_STATIC=`ruby_get_config_param "LIBRUBYARG_STATIC"`
     57RUBY_CONFIG_CCDLFLAGS=`ruby_get_config_param "CCDLFLAGS"`
     58echo RUBY_CONFIG_ARCHDIR=$RUBY_CONFIG_ARCHDIR
     59echo RUBY_CONFIG_ARCH=$RUBY_CONFIG_ARCH
     60echo RUBY_CONFIG_LIBDIR=$RUBY_CONFIG_LIBDIR
     61echo RUBY_CONFIG_BINDIR=$RUBY_CONFIG_BINDIR
     62echo RUBY_CONFIG_RUBYHDRDIR=$RUBY_CONFIG_RUBYHDRDIR
     63echo RUBY_CONFIG_CFLAGS=$RUBY_CONFIG_CFLAGS
     64echo RUBY_CONFIG_LDFLAGS=$RUBY_CONFIG_LDFLAGS
     65echo RUBY_CONFIG_SITELIBDIR=$RUBY_CONFIG_SITELIBDIR
     66echo RUBY_VERSION=$RUBY_VERSION
    5567
    56 if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
     68if test "x${RUBY_CONFIG_RUBYHDRDIR}" != "x"; then
    5769  # 1.9
    5870  RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
    5971  RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
     72  echo RUBY_CPPFLAGS=$RUBY_CPPFLAGS"
    6073else
    6174  # 1.8
    6275  RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
     76  echo "RUBY_CPPFLAGS=$RUBY_CPPFLAGS"
    6377fi
    6478AC_SUBST(RUBY_CPPFLAGS)
     
    8296AC_SUBST(RUBY_LIBRUBYARG_STATIC)
    8397
    84 dnl If the user specified a prefix, then use it, otherwise defalut to
    85 dnl the configured sitelibdir
    86 if test "x${ruby_sitelibdir}x" != "xNONEx"
    87 then
    88   RUBY_SITELIBDIR="${ruby_sitelibdir}"
    89 else
    90   if test "x${prefix}x" = "xNONEx"
    91   then
    92     RUBY_SITELIBDIR=`RUBY_CONFIG(sitelibdir)`
    93   else
    94     sitelibdir_no_prefix=`$RUBY -rrbconfig \
    95     -e "include Config; \
    96     puts CONFIG[['sitelibdir']].sub(CONFIG[['prefix']], '')"`
    97     RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}"
    98   fi
    99 fi
    100 AC_SUBST(RUBY_SITELIBDIR)
    101 
    10298dnl The fourth parameter to AC_CHECK_HEADER keeps autoconf from
    10399dnl searching for standard header files as a side-effect (which we want)
    104100CPPFLAGS_save="${CPPFLAGS}"
    105 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
    106 CXXFLAGS="${CPPFLAGS}"
     101CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS} -I${RUBY_HEADER_DIR}"
     102echo CPPFLAGS=$CPPFLAGS
    107103AC_CHECK_HEADERS(ruby.h)
    108104HAVE_RUBY_H=${ac_cv_header_ruby_h}
     
    129125AC_MINGW32
    130126
    131 if test x"${MINGW32}"x = xyesx; then
     127if test "${MINGW32}" = yes; then
    132128  RB_FIX_MINGW_LIBS
    133129fi
  • branches/r9/lang/configure

    r4914 r5803  
    691691build
    692692HAVE_RUBY_H
    693 RUBY_SITELIBDIR
    694693RUBY_LIBRUBYARG_STATIC
    695694RUBY_LIBRUBYARG
     
    88318830# Check whether --with-ruby_sitelibdir was given.
    88328831if test "${with_ruby_sitelibdir+set}" = set; then :
    8833   withval=$with_ruby_sitelibdir;  ruby_sitelibdir=$withval
    8834 else
    8835    ruby_sitelibdir=NONE
     8832  withval=$with_ruby_sitelibdir; WITH_RUBY_SITELIBDIR=$withval
     8833else
     8834  WITH_RUBY_SITELIBDIR=""
    88368835fi
    88378836
     
    88928891
    88938892
    8894 
     8893. ${srcdir}/cf/rp_ruby_functions.sh
     8894
     8895#AC_DEFUN([RUBY_CONFIG], [
     8896# $RUBY -rrbconfig -e "puts(RbConfig::CONFIG[['']])"])
    88958897
    88968898RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
    88978899
    88988900
    8899 RUBY_CONFIG_SO_NAME=`
    8900           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8901 RUBY_CONFIG_ARCHDIR=`
    8902           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8903 RUBY_CONFIG_ARCH=`
    8904           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8905 RUBY_CONFIG_LIBDIR=`
    8906           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8907 RUBY_CONFIG_BINDIR=`
    8908           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8909 RUBY_CONFIG_RUBYHDRDIR=`
    8910           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8911 RUBY_CONFIG_CFLAGS=`
    8912           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8913 RUBY_CONFIG_LIBS=`
    8914           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8915 RUBY_CONFIG_DLDLIBS=`
    8916           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8917 RUBY_CONFIG_LDFLAGS=`
    8918           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8919 RUBY_CONFIG_LIBRUBYARG=`
    8920           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8921 RUBY_CONFIG_LIBRUBYARG_STATIC=`
    8922           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8923 RUBY_CONFIG_CCDLFLAGS=`
    8924           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8925 
    8926 if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
     8901RUBY_VERSION=`ruby_get_config_param "ruby_version"`
     8902RUBY_CONFIG_ARCHDIR=`ruby_get_config_param "archdir"`
     8903RUBY_CONFIG_ARCH=`ruby_get_config_param "arch"`
     8904RUBY_CONFIG_LIBDIR=`ruby_get_config_param "libdir"`
     8905RUBY_CONFIG_BINDIR=`ruby_get_config_param "bindir"`
     8906RUBY_CONFIG_RUBYHDRDIR=`ruby_get_config_param rubyhdrdir`
     8907RUBY_CONFIG_CFLAGS=`ruby_get_config_param CFLAGS`
     8908RUBY_CONFIG_LIBS=`ruby_get_config_param LIBS`
     8909RUBY_CONFIG_DLDLIBS=`ruby_get_config_param DLDLIBS`
     8910RUBY_CONFIG_LDFLAGS=`ruby_get_config_param LDFLAGS`
     8911RUBY_CONFIG_SITELIBDIR=`ruby_get_config_param sitelibdir`
     8912RUBY_CONFIG_LIBRUBYARG=`ruby_get_config_param LIBRUBYARG`
     8913RUBY_CONFIG_LIBRUBYARG_STATIC=`ruby_get_config_param "LIBRUBYARG_STATIC"`
     8914RUBY_CONFIG_CCDLFLAGS=`ruby_get_config_param "CCDLFLAGS"`
     8915echo RUBY_CONFIG_ARCHDIR=$RUBY_CONFIG_ARCHDIR
     8916echo RUBY_CONFIG_ARCH=$RUBY_CONFIG_ARCH
     8917echo RUBY_CONFIG_LIBDIR=$RUBY_CONFIG_LIBDIR
     8918echo RUBY_CONFIG_BINDIR=$RUBY_CONFIG_BINDIR
     8919echo RUBY_CONFIG_RUBYHDRDIR=$RUBY_CONFIG_RUBYHDRDIR
     8920echo RUBY_CONFIG_CFLAGS=$RUBY_CONFIG_CFLAGS
     8921echo RUBY_CONFIG_LDFLAGS=$RUBY_CONFIG_LDFLAGS
     8922echo RUBY_CONFIG_SITELIBDIR=$RUBY_CONFIG_SITELIBDIR
     8923echo RUBY_VERSION=$RUBY_VERSION
     8924
     8925if test "x${RUBY_CONFIG_RUBYHDRDIR}" != "x"; then
    89278926  # 1.9
    89288927  RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
    89298928  RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
     8929  echo RUBY_CPPFLAGS=$RUBY_CPPFLAGS"
    89308930else
    89318931  # 1.8
    89328932  RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
     8933  echo "RUBY_CPPFLAGS=$RUBY_CPPFLAGS"
    89338934fi
    89348935
     
    89528953
    89538954
    8954 if test "x${ruby_sitelibdir}x" != "xNONEx"
    8955 then
    8956   RUBY_SITELIBDIR="${ruby_sitelibdir}"
    8957 else
    8958   if test "x${prefix}x" = "xNONEx"
    8959   then
    8960     RUBY_SITELIBDIR=`
    8961           $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    8962   else
    8963     sitelibdir_no_prefix=`$RUBY -rrbconfig \
    8964     -e "include Config; \
    8965     puts CONFIG['sitelibdir'].sub(CONFIG['prefix'], '')"`
    8966     RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}"
    8967   fi
    8968 fi
    8969 
    8970 
    89718955CPPFLAGS_save="${CPPFLAGS}"
    8972 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
    8973 CXXFLAGS="${CPPFLAGS}"
     8956CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS} -I${RUBY_HEADER_DIR}"
     8957echo CPPFLAGS=$CPPFLAGS
    89748958for ac_header in ruby.h
    89758959do :
     
    90599043
    90609044
    9061 if test x"${MINGW32}"x = xyesx; then
     9045if test "${MINGW32}" = yes; then
    90629046
    90639047RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%oldnames.lib%-lmoldname%"`
Note: See TracChangeset for help on using the changeset viewer.