ggz-grubby-libdir.patch

   1 --- ggz-grubby-0.0.14.1/configure.ac.orig       2013-02-01 15:08:02.704455518 +0100
   2 +++ ggz-grubby-0.0.14.1/configure.ac    2013-02-01 16:44:15.784335188 +0100
   3 @@ -61,15 +61,11 @@
   4         echo -n "Extra check: perl... "
   5
   6         inc=`perl -MConfig -e 'print "$Config{archlibexp}/CORE"' 2>/dev/null`
   7 -       incs="$inc /usr/lib/perl/5.8.0/CORE /usr/lib/perl/5.6.1/CORE /usr/lib/perl/5.6.0/CORE"
   8 +       incs="$inc"
   9         AC_GGZ_FIND_FILE("perl.h", $incs, perl_incdir)
  10         perl_includes="$perl_incdir"
  11
  12 -       libs="/usr/local/lib /usr/lib"
  13 -       AC_GGZ_FIND_FILE("libperl.so", $libs, perl_libdir)
  14 -       perl_libraries="$perl_libdir"
  15 -
  16 -       if test "x$perl_includes" = "xNO" || test "x$perl_libraries" = "xNO"; then
  17 +       if test "x$perl_includes" = "xNO" ; then
  18                 AC_MSG_RESULT(no.)
  19                 perl_includes=""
  20                 perl_libraries=""
  21 @@ -124,18 +120,15 @@
  22         echo -n "Extra check: python... "
  23
  24         usever=""
  25 -       for ver in 2.2 2.3 2.4; do
  26 +       for ver in 2.2 2.3 2.4 2.5 2.6 2.7; do
  27                 incs="/usr/local/include/python$ver /usr/include/python$ver"
  28                 AC_GGZ_FIND_FILE("Python.h", $incs, python_incdir)
  29
  30 -               libs="/usr/local/lib /usr/lib"
  31 -               AC_GGZ_FIND_FILE(libpython$ver.so, $libs, python_libdir)
  32 -
  33 -               if test "x$python_incdir" = "xNO" || test "x$python_libdir" = "xNO"; then
  34 +               if test "x$python_incdir" = "xNO" ; then
  35                         this_is_not_the_right_version=1
  36                 else
  37 -                       python_includes="-I $python_incdir"
  38 -                       python_libraries="-L $python_libdir -lpython$ver"
  39 +                       python_includes="-I$python_incdir"
  40 +                       python_libraries="-lpython$ver"
  41                         usever=$ver
  42                         enable_python=yes
  43                 fi
  44 @@ -154,23 +147,19 @@
  45  if test "$enable_tcl" = yes; then
  46         echo -n "Extra check: tcl... "
  47
  48 -       incs="/usr/include/tcl8.4"
  49 +       incs="/usr/include"
  50         AC_GGZ_FIND_FILE("tcl.h", $incs, tcl_incdir)
  51         tcl_includes="$tcl_incdir"
  52
  53 -       libs="/usr/lib"
  54 -       AC_GGZ_FIND_FILE("libtcl8.4.so", $libs, tcl_libdir)
  55 -       tcl_libraries="$tcl_libdir"
  56 -
  57 -       if test "x$tcl_includes" = "xNO" || test "x$tcl_libraries" = "xNO"; then
  58 +       if test "x$tcl_includes" = "xNO" ; then
  59                 AC_MSG_RESULT(no.)
  60                 tcl_includes=""
  61                 tcl_libraries=""
  62                 enable_tcl=no
  63         else
  64                 AC_MSG_RESULT(ok.)
  65 -               tcl_includes="-I $tcl_includes"
  66 -               tcl_libraries="-L $tcl_libraries -ltcl8.4"
  67 +               tcl_includes=
  68 +               tcl_libraries="-ltcl"
  69                 AC_SUBST(tcl_includes)
  70                 AC_SUBST(tcl_libraries)
  71                 AC_DEFINE([EMBED_TCL], 1, [Define to use embedded Tcl])
  72 @@ -238,7 +227,7 @@
  73  dnl ============
  74
  75  grubbydir="${prefix}/share/grubby"
  76 -grubbymoddir="${prefix}/lib/grubby"
  77 +grubbymoddir="${libdir}/grubby"
  78
  79  AC_DEFINE_UNQUOTED([GRUBBYDIR], "${grubbydir}", [Grubby's directory])
  80