--- configure.orig	2014-04-13 22:41:48.000000000 +0200
+++ configure	2015-09-05 16:25:22.901752000 +0200
@@ -17827,6 +17827,9 @@
 	        CFLAGS="${CFLAGS} -fno-common -Wall"
 	        LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
 	        ;;
+	    *alpha*-freebsd* )
+	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
+		    ;;
 	    *-freebsd* )
 	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
 		    ;;
@@ -21101,7 +21104,7 @@
       if test "x$GUILE" = "x"; then
         use_guile="No (guile not available)"
       else
-        GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
+        GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`
         GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
         GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
         if test 0$GUILE_VERSION_MAJOR -lt 2; then
@@ -21669,7 +21672,9 @@
 
         LUA_INCLUDES=""
         LUA_LIBS=""
-        LUA_INSTALL_DIR=""
+	if test -z "$LUA_INSTALL_DIR" ; then
+	        LUA_INSTALL_DIR=""
+	fi
 
         if test -n "$lua_inc"; then
            CFLAGS="$CFLAGS -I$lua_inc"
@@ -21731,13 +21736,13 @@
 	            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
 	            if test "x$?" = "x0" ; then
 		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
-                        LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
+                        LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lua$l`
                         LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
 		        LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
 
 		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
 		        if test  "x$?" = "x0"; then
-		           LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
+		           LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lualib$l`
 		           LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
 		        fi
                         break