--- ggz-grubby-0.0.14.1/configure.ac.orig	2013-02-01 15:08:02.704455518 +0100
+++ ggz-grubby-0.0.14.1/configure.ac	2013-02-01 16:44:15.784335188 +0100
@@ -61,15 +61,11 @@
 	echo -n "Extra check: perl... "
 
 	inc=`perl -MConfig -e 'print "$Config{archlibexp}/CORE"' 2>/dev/null`
-	incs="$inc /usr/lib/perl/5.8.0/CORE /usr/lib/perl/5.6.1/CORE /usr/lib/perl/5.6.0/CORE"
+	incs="$inc"
 	AC_GGZ_FIND_FILE("perl.h", $incs, perl_incdir)
 	perl_includes="$perl_incdir"
 
-	libs="/usr/local/lib /usr/lib"
-	AC_GGZ_FIND_FILE("libperl.so", $libs, perl_libdir)
-	perl_libraries="$perl_libdir"
-
-	if test "x$perl_includes" = "xNO" || test "x$perl_libraries" = "xNO"; then
+	if test "x$perl_includes" = "xNO" ; then
 		AC_MSG_RESULT(no.)
 		perl_includes=""
 		perl_libraries=""
@@ -124,18 +120,15 @@
 	echo -n "Extra check: python... "
 
 	usever=""
-	for ver in 2.2 2.3 2.4; do
+	for ver in 2.2 2.3 2.4 2.5 2.6 2.7; do
 		incs="/usr/local/include/python$ver /usr/include/python$ver"
 		AC_GGZ_FIND_FILE("Python.h", $incs, python_incdir)
 
-		libs="/usr/local/lib /usr/lib"
-		AC_GGZ_FIND_FILE(libpython$ver.so, $libs, python_libdir)
-
-		if test "x$python_incdir" = "xNO" || test "x$python_libdir" = "xNO"; then
+		if test "x$python_incdir" = "xNO" ; then
 			this_is_not_the_right_version=1
 		else
-			python_includes="-I $python_incdir"
-			python_libraries="-L $python_libdir -lpython$ver"
+			python_includes="-I$python_incdir"
+			python_libraries="-lpython$ver"
 			usever=$ver
 			enable_python=yes
 		fi
@@ -154,23 +147,19 @@
 if test "$enable_tcl" = yes; then
 	echo -n "Extra check: tcl... "
 
-	incs="/usr/include/tcl8.4"
+	incs="/usr/include"
 	AC_GGZ_FIND_FILE("tcl.h", $incs, tcl_incdir)
 	tcl_includes="$tcl_incdir"
 
-	libs="/usr/lib"
-	AC_GGZ_FIND_FILE("libtcl8.4.so", $libs, tcl_libdir)
-	tcl_libraries="$tcl_libdir"
-
-	if test "x$tcl_includes" = "xNO" || test "x$tcl_libraries" = "xNO"; then
+	if test "x$tcl_includes" = "xNO" ; then
 		AC_MSG_RESULT(no.)
 		tcl_includes=""
 		tcl_libraries=""
 		enable_tcl=no
 	else
 		AC_MSG_RESULT(ok.)
-		tcl_includes="-I $tcl_includes"
-		tcl_libraries="-L $tcl_libraries -ltcl8.4"
+		tcl_includes=
+		tcl_libraries="-ltcl"
 		AC_SUBST(tcl_includes)
 		AC_SUBST(tcl_libraries)
 		AC_DEFINE([EMBED_TCL], 1, [Define to use embedded Tcl])
@@ -238,7 +227,7 @@
 dnl ============
 
 grubbydir="${prefix}/share/grubby"
-grubbymoddir="${prefix}/lib/grubby"
+grubbymoddir="${libdir}/grubby"
 
 AC_DEFINE_UNQUOTED([GRUBBYDIR], "${grubbydir}", [Grubby's directory])