diff --git a/configure.ac b/configure.ac
index 528dc6a..92a532e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,15 +71,15 @@ if test "_$rubyen" = "_yes"; then
   	RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
   	if test "$RUBYDIR" != ""; then
   		dirs="$RUBYDIR"
-  		RUBYINCLUDE=none
+  		RUBY_CFLAGS=none
   		for i in $dirs; do
   			if test -r $i/ruby.h; then
   				AC_MSG_RESULT($i)
-  				RUBYINCLUDE="-idirafter $i"
+  				RUBY_CFLAGS="-idirafter $i"
   				break;
   			fi
   		done
-  		if test "$RUBYINCLUDE" = none; then
+  		if test "$RUBY_CFLAGS" = none; then
   			AC_MSG_RESULT(could not locate ruby.h, disabling ruby support)
   			rubymsg="(no headers found, install ruby-dev)"
   			rubyen="no"
@@ -93,7 +93,7 @@ if test "_$rubyen" = "_yes"; then
   		dirs="$dirs $rb_libdir $rb_bindir"
 
           rb_libruby=`($RUBY -rrbconfig -e 'print Config::CONFIG[["LIBRUBY_A"]]') 2>/dev/null`
-          RUBYLINK=`($RUBY -rrbconfig -e '
+          RUBY_LIBS=`($RUBY -rrbconfig -e '
               c = Config::CONFIG
               if c.has_key? "LIBRUBYARG_STATIC" # 1.8.x
                   if c[["LIBRUBY"]] == c[["LIBRUBY_A"]]
@@ -119,7 +119,7 @@ if test "_$rubyen" = "_yes"; then
   			rubymsg="(libs not found)"
   			rubyen="no"
   		else
-  			AC_MSG_RESULT($RUBYLINK in $RUBYLIB)
+  			AC_MSG_RESULT($RUBY_LIBS in $RUBYLIB)
   		fi
   	else
   		AC_MSG_RESULT(unable to determine ruby configuration, disabling ruby support)
@@ -134,17 +134,17 @@ if test "_$rubyen" = "_yes"; then
 fi
 
 if test "_$rubyen" == "_no"; then
-  RUBYINCLUDE=""
-  RUBYLINK=""
-  AM_CONDITIONAL(HAVE_SCRIPT, false)
+  RUBY_CFLAGS=""
+  RUBY_LIBS=""
+  AM_CONDITIONAL(HAS_RUBY, false)
 else
   rubymsg="enjoy scripting :)"
   AC_DEFINE([HAVE_RUBY], 1, [Ruby scripting is enabled])
-  AM_CONDITIONAL(HAVE_SCRIPT, true)
+  AM_CONDITIONAL(HAS_RUBY, true)
 fi
 
-AC_SUBST(RUBYINCLUDE)
-AC_SUBST(RUBYLINK)
+AC_SUBST(RUBY_CFLAGS)
+AC_SUBST(RUBY_LIBS)
 
 # Look for libnotify
 LIBNOTIFY_REQUIRED=0.2.3