Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > 899ac9a7492c8ad02c39e4cc776c40bb > files > 5

redland-bindings-1.0.7.1-1.fc13.src.rpm

Index: redland-bindings-1.0.7.1/configure.ac
===================================================================
--- redland-bindings-1.0.7.1/configure.ac.orig
+++ redland-bindings-1.0.7.1/configure.ac
@@ -265,12 +265,17 @@ if test "X$RUBY" != X; then
 
   dnl need to change quotes to allow square brackets
   changequote(<<, >>)dnl
+
   ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
-  RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"`
   LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"`
-  RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
-  RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
+  dnl this will install in the sitearchdir; compare to Python above
+  dnl if some distros really need
+  dnl to install in the vendor dir, this should be made configureable with
+  dnl a configure argument
+  RUBY_ARCHDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['sitearchdir']"`
   changequote([, ])dnl
+  AC_MSG_CHECKING(Ruby archdir)
+  AC_MSG_RESULT($RUBY_ARCHDIR)
 
   RUBY_INCLUDES="-I$ruby_prefix"
 else
@@ -279,15 +284,11 @@ else
   RUBY=:
   RUBY_INCLUDES=
   LIBRUBYARG_SHARED=
-  RUBY_LIB=
-  RUBY_DIR=
-  RUBY_LIBDIR=
+  RUBY_ARCHDIR=
 fi
 AC_SUBST(RUBY_INCLUDES)
 AC_SUBST(LIBRUBYARG_SHARED)
-AC_SUBST(RUBY_LIB)
-AC_SUBST(RUBY_DIR)
-AC_SUBST(RUBY_LIBDIR)
+AC_SUBST(RUBY_ARCHDIR)
 
 
 AC_ARG_WITH(php, [  --with-php(=PHP)        Enable the PHP interface], with_php="$withval", with_php="no")
Index: redland-bindings-1.0.7.1/ruby/Makefile.am
===================================================================
--- redland-bindings-1.0.7.1/ruby/Makefile.am.orig
+++ redland-bindings-1.0.7.1/ruby/Makefile.am
@@ -32,11 +32,9 @@ SWIG_CRUFT=
 RDOC_DIR=rdoc
 RDOC_STAMP=rdoc-stamp
 
-rubylib=@RUBY_LIB@
 librubyarg_shared=@LIBRUBYARG_SHARED@
 
-rubydir=/usr/lib/$(rubylib)
-rubyarchdir=@RUBY_DIR@
+rubyarchdir=@RUBY_ARCHDIR@
 
 rubyarch_DATA=redland.so
 
Index: redland-bindings-1.0.7.1/ruby/Makefile.in
===================================================================
--- redland-bindings-1.0.7.1/ruby/Makefile.in.orig
+++ redland-bindings-1.0.7.1/ruby/Makefile.in
@@ -162,10 +162,8 @@ REDLAND_RUN = @REDLAND_RUN@
 REDLAND_SWIG = @REDLAND_SWIG@
 REDLAND_VERSION = @REDLAND_VERSION@
 RUBY = @RUBY@
-RUBY_DIR = @RUBY_DIR@
+RUBY_ARCHDIR = @RUBY_ARCHDIR@
 RUBY_INCLUDES = @RUBY_INCLUDES@
-RUBY_LIB = @RUBY_LIB@
-RUBY_LIBDIR = @RUBY_LIBDIR@
 RUBY_VERSION = @RUBY_VERSION@
 SD = @SD@
 SED = @SED@
@@ -234,10 +232,8 @@ SWIG_OUTPUTS = $(RUBY_PACKAGE)_wrap.c
 SWIG_CRUFT = 
 RDOC_DIR = rdoc
 RDOC_STAMP = rdoc-stamp
-rubylib = @RUBY_LIB@
 librubyarg_shared = @LIBRUBYARG_SHARED@
-rubydir = /usr/lib/$(rubylib)
-rubyarchdir = @RUBY_DIR@
+rubyarchdir = @RUBY_ARCHDIR@
 rubyarch_DATA = redland.so
 EXTRA_DIST = example.rb test.rb \
 redland-pre.i redland-types.i $(SWIG_OUTPUTS)
Index: redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.am
===================================================================
--- redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.am.orig
+++ redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.am
@@ -17,7 +17,7 @@
 # full license terms.
 #
 
-rubydir=@RUBY_LIBDIR@/rdf
+rubydir=@RUBY_ARCHDIR@/rdf
 
 ruby_DATA=redland.rb
 
Index: redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.in
===================================================================
--- redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.in.orig
+++ redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.in
@@ -162,10 +162,8 @@ REDLAND_RUN = @REDLAND_RUN@
 REDLAND_SWIG = @REDLAND_SWIG@
 REDLAND_VERSION = @REDLAND_VERSION@
 RUBY = @RUBY@
-RUBY_DIR = @RUBY_DIR@
+RUBY_ARCHDIR = @RUBY_ARCHDIR@
 RUBY_INCLUDES = @RUBY_INCLUDES@
-RUBY_LIB = @RUBY_LIB@
-RUBY_LIBDIR = @RUBY_LIBDIR@
 RUBY_VERSION = @RUBY_VERSION@
 SD = @SD@
 SED = @SED@
@@ -226,7 +224,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-rubydir = @RUBY_LIBDIR@/rdf
+rubydir = @RUBY_ARCHDIR@/rdf
 ruby_DATA = redland.rb
 EXTRA_DIST = redland.rb
 SUBDIRS = redland
Index: redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.am
===================================================================
--- redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.am.orig
+++ redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.am
@@ -17,7 +17,7 @@
 # full license terms.
 #
 
-rubydir=@RUBY_LIBDIR@/rdf/redland
+rubydir=@RUBY_ARCHDIR@/rdf/redland
 
 ruby_DATA=$(EXTRA_DIST)
 
Index: redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.in
===================================================================
--- redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.in.orig
+++ redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.in
@@ -162,10 +162,8 @@ REDLAND_RUN = @REDLAND_RUN@
 REDLAND_SWIG = @REDLAND_SWIG@
 REDLAND_VERSION = @REDLAND_VERSION@
 RUBY = @RUBY@
-RUBY_DIR = @RUBY_DIR@
+RUBY_ARCHDIR = @RUBY_ARCHDIR@
 RUBY_INCLUDES = @RUBY_INCLUDES@
-RUBY_LIB = @RUBY_LIB@
-RUBY_LIBDIR = @RUBY_LIBDIR@
 RUBY_VERSION = @RUBY_VERSION@
 SD = @SD@
 SED = @SED@
@@ -226,7 +224,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-rubydir = @RUBY_LIBDIR@/rdf/redland
+rubydir = @RUBY_ARCHDIR@/rdf/redland
 ruby_DATA = $(EXTRA_DIST)
 EXTRA_DIST = constants.rb convert_owl.rb convertfoaf.rb dc.rb model.rb \
 node.rb parser.rb query.rb resource.rb serializer.rb statement.rb \
Index: redland-bindings-1.0.7.1/configure
===================================================================
--- redland-bindings-1.0.7.1/configure.orig
+++ redland-bindings-1.0.7.1/configure
@@ -890,9 +890,7 @@ PYTHON_LIB
 PYTHON_LDFLAGS
 RUBY_INCLUDES
 LIBRUBYARG_SHARED
-RUBY_LIB
-RUBY_DIR
-RUBY_LIBDIR
+RUBY_ARCHDIR
 PHP_VERSION
 RUBY_VERSION
 REDLAND_CONFIG
@@ -4540,7 +4538,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4543 "configure"' > conftest.$ac_ext
+  echo '#line 4541 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6553,11 +6551,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6556: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6554: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6560: \$? = $ac_status" >&5
+   echo "$as_me:6558: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6843,11 +6841,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6844: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6850: \$? = $ac_status" >&5
+   echo "$as_me:6848: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6947,11 +6945,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6950: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6948: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6954: \$? = $ac_status" >&5
+   echo "$as_me:6952: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9298,7 +9296,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9301 "configure"
+#line 9299 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9398,7 +9396,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9401 "configure"
+#line 9399 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11818,11 +11816,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11821: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11819: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11825: \$? = $ac_status" >&5
+   echo "$as_me:11823: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11922,11 +11920,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11925: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11923: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11929: \$? = $ac_status" >&5
+   echo "$as_me:11927: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13486,11 +13484,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13489: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13487: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13493: \$? = $ac_status" >&5
+   echo "$as_me:13491: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13590,11 +13588,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13593: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13591: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13597: \$? = $ac_status" >&5
+   echo "$as_me:13595: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15779,11 +15777,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15782: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15780: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15786: \$? = $ac_status" >&5
+   echo "$as_me:15784: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16069,11 +16067,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16070: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16076: \$? = $ac_status" >&5
+   echo "$as_me:16074: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16173,11 +16171,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16176: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16174: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16180: \$? = $ac_status" >&5
+   echo "$as_me:16178: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19419,11 +19417,14 @@ fi
 
 if test "X$RUBY" != X; then
 
-      ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
-  RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"`
+
+  ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
   LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"`
-  RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
-  RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
+          RUBY_ARCHDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['sitearchdir']"`
+    { echo "$as_me:$LINENO: checking Ruby archdir" >&5
+echo $ECHO_N "checking Ruby archdir... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: result: $RUBY_ARCHDIR" >&5
+echo "${ECHO_T}$RUBY_ARCHDIR" >&6; }
 
   RUBY_INCLUDES="-I$ruby_prefix"
 else
@@ -19432,9 +19433,7 @@ else
   RUBY=:
   RUBY_INCLUDES=
   LIBRUBYARG_SHARED=
-  RUBY_LIB=
-  RUBY_DIR=
-  RUBY_LIBDIR=
+  RUBY_ARCHDIR=
 fi
 
 
@@ -19442,8 +19441,6 @@ fi
 
 
 
-
-
 # Check whether --with-php was given.
 if test "${with_php+set}" = set; then
   withval=$with_php; with_php="$withval"
@@ -20542,9 +20539,7 @@ PYTHON_LIB!$PYTHON_LIB$ac_delim
 PYTHON_LDFLAGS!$PYTHON_LDFLAGS$ac_delim
 RUBY_INCLUDES!$RUBY_INCLUDES$ac_delim
 LIBRUBYARG_SHARED!$LIBRUBYARG_SHARED$ac_delim
-RUBY_LIB!$RUBY_LIB$ac_delim
-RUBY_DIR!$RUBY_DIR$ac_delim
-RUBY_LIBDIR!$RUBY_LIBDIR$ac_delim
+RUBY_ARCHDIR!$RUBY_ARCHDIR$ac_delim
 PHP_VERSION!$PHP_VERSION$ac_delim
 RUBY_VERSION!$RUBY_VERSION$ac_delim
 REDLAND_CONFIG!$REDLAND_CONFIG$ac_delim
@@ -20565,7 +20560,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional