By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 735
Collapse All | Expand All

(-)koffice/configure.in (-19 / +53 lines)
Lines 1539-1570 Link Here
1539
# Check for Ruby
1539
# Check for Ruby
1540
1540
1541
if test "x$compile_kross" = "xyes" ; then
1541
if test "x$compile_kross" = "xyes" ; then
1542
  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
1542
  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
1543
1543
1544
  if test -n "$RUBY"; then
1544
  if test -n "$RUBY"; then
1545
    AC_MSG_CHECKING(for Ruby dirs)
1545
    AC_MSG_CHECKING(for Ruby dirs)
1546
    RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
1546
    # Note: pkgconfig file exists only for ruby >= 1.9.3
1547
    RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
1547
    if test -n "$PKGCONFIG"; then
1548
    RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
1548
      RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
1549
    RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
1549
      if test -n "$RUBY_VERSION"; then
1550
    RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
1550
        RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
1551
    RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
1551
      else
1552
    RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
1552
        RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
1553
        RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
1554
      fi
1555
      if test -z "$RUBY_VERSION"; then
1556
        # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
1557
        if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
1558
          # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
1559
          RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'`
1560
          RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'`
1561
          RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'`
1562
          if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then
1563
            RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY"
1564
          fi
1565
        fi
1566
      fi
1567
      if test -n "$RUBY_VERSION"; then
1568
        RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
1569
        RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
1570
        RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
1571
        RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
1572
        RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
1573
        RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`
1574
        RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
1575
        AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
1576
      fi
1577
    fi
1578
    if test -z "$RUBY_VERSION"; then
1579
      RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
1580
      RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
1581
      RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
1582
      RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
1583
      RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
1584
      RUBY_INCLUDEDIR=$RUBY_ARCHDIR
1585
      RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
1586
    fi
1553
    AC_MSG_RESULT([
1587
    AC_MSG_RESULT([
1554
                   archdir $RUBY_ARCHDIR,
1588
                    archdir $RUBY_ARCHDIR,
1555
                   sitearchdir $RUBY_SITEARCHDIR,
1589
                    sitearchdir $RUBY_SITEARCHDIR,
1556
                   sitedir $RUBY_SITEDIR,
1590
                    sitedir $RUBY_SITEDIR,
1557
                   includedir $RUBY_INCLUDEDIR,
1591
                    rubylibdir $RUBY_RUBYLIBDIR,
1558
                   libdir $RUBY_LIBDIR,
1592
                    libdir $RUBY_LIBDIR,
1559
                   librubyarg $RUBY_LIBRUBYARG,
1593
                    includedir $RUBY_INCLUDEDIR,
1560
                   rubysharedenabled $RUBY_ENABLESHARED])
1594
                    librubyarg $RUBY_LIBRUBYARG,
1595
                    cflags $RUBY_CFLAGS])
1561
    AC_SUBST(RUBY_ARCHDIR)
1596
    AC_SUBST(RUBY_ARCHDIR)
1562
    AC_SUBST(RUBY_SITEARCHDIR)
1597
    AC_SUBST(RUBY_SITEARCHDIR)
1563
    AC_SUBST(RUBY_SITEDIR)
1598
    AC_SUBST(RUBY_RUBYLIBDIR)
1564
    AC_SUBST(RUBY_INCLUDEDIR)
1599
    AC_SUBST(RUBY_INCLUDEDIR)
1565
    AC_SUBST(RUBY_LIBDIR)
1600
    AC_SUBST(RUBY_SITEDIR)
1566
    AC_SUBST(RUBY_LIBRUBYARG)
1601
    AC_SUBST(RUBY_CFLAGS)
1567
    AC_SUBST(RUBY_ENABLESHARED)
1568
1602
1569
    AC_MSG_CHECKING(for Ruby header)
1603
    AC_MSG_CHECKING(for Ruby header)
1570
1604
(-)koffice/lib/kross/configure.in.in (-15 / +28 lines)
Lines 25-34 Link Here
25
# Check for Ruby
25
# Check for Ruby
26
26
27
if test "x$compile_kross" = "xyes" ; then
27
if test "x$compile_kross" = "xyes" ; then
28
  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
28
  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
29
29
30
  if test -n "$RUBY"; then
30
  if test -n "$RUBY"; then
31
    AC_MSG_CHECKING(for Ruby dirs)
31
    AC_MSG_CHECKING(for Ruby dirs)
32
    # Note: pkgconfig file exists only for ruby >= 1.9.3
32
    if test -n "$PKGCONFIG"; then
33
    if test -n "$PKGCONFIG"; then
33
      RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
34
      RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
34
      if test -n "$RUBY_VERSION"; then
35
      if test -n "$RUBY_VERSION"; then
Lines 37-49 Link Here
37
        RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
38
        RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
38
        RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
39
        RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
39
      fi
40
      fi
41
      if test -z "$RUBY_VERSION"; then
42
        # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
43
        if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
44
          # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
45
          RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'`
46
          RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'`
47
          RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'`
48
          if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then
49
            RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY"
50
          fi
51
        fi
52
      fi
40
      if test -n "$RUBY_VERSION"; then
53
      if test -n "$RUBY_VERSION"; then
41
        RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
54
        RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
42
        RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
55
        RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
43
        RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
56
        RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
57
        RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
44
        RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
58
        RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
59
        RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`
45
        RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
60
        RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
46
        RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
47
        AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
61
        AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
48
      fi
62
      fi
49
    fi
63
    fi
Lines 51-76 Link Here
51
      RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
65
      RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
52
      RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
66
      RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
53
      RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
67
      RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
54
      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
68
      RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
55
      RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
69
      RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
70
      RUBY_INCLUDEDIR=$RUBY_ARCHDIR
56
      RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
71
      RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
57
      RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
58
    fi
72
    fi
59
    AC_MSG_RESULT([
73
    AC_MSG_RESULT([
60
                   archdir $RUBY_ARCHDIR,
74
                    archdir $RUBY_ARCHDIR,
61
                   sitearchdir $RUBY_SITEARCHDIR,
75
                    sitearchdir $RUBY_SITEARCHDIR,
62
                   sitedir $RUBY_SITEDIR,
76
                    sitedir $RUBY_SITEDIR,
63
                   includedir $RUBY_INCLUDEDIR,
77
                    rubylibdir $RUBY_RUBYLIBDIR,
64
                   libdir $RUBY_LIBDIR,
78
                    libdir $RUBY_LIBDIR,
65
                   librubyarg $RUBY_LIBRUBYARG,
79
                    includedir $RUBY_INCLUDEDIR,
66
                   rubysharedenabled $RUBY_ENABLESHARED])
80
                    librubyarg $RUBY_LIBRUBYARG,
81
                    cflags $RUBY_CFLAGS])
67
    AC_SUBST(RUBY_ARCHDIR)
82
    AC_SUBST(RUBY_ARCHDIR)
68
    AC_SUBST(RUBY_SITEARCHDIR)
83
    AC_SUBST(RUBY_SITEARCHDIR)
69
    AC_SUBST(RUBY_SITEDIR)
84
    AC_SUBST(RUBY_RUBYLIBDIR)
70
    AC_SUBST(RUBY_INCLUDEDIR)
85
    AC_SUBST(RUBY_INCLUDEDIR)
71
    AC_SUBST(RUBY_LIBDIR)
86
    AC_SUBST(RUBY_SITEDIR)
72
    AC_SUBST(RUBY_LIBRUBYARG)
73
    AC_SUBST(RUBY_ENABLESHARED)
74
    AC_SUBST(RUBY_CFLAGS)
87
    AC_SUBST(RUBY_CFLAGS)
75
88
76
    AC_MSG_CHECKING(for Ruby header)
89
    AC_MSG_CHECKING(for Ruby header)

Return to bug 735