Fix check for alt include dir

diff --git a/src/modules/rlm_ruby/configure b/src/modules/rlm_ruby/configure
index 2544040b8f921033d6c4c8eac475cb6db78ec5c8..9e3e5c06236bcc3f0d68fcdc353ee3ab52244dd3 100755 (executable)
--- a/src/modules/rlm_ruby/configure
+++ b/src/modules/rlm_ruby/configure
@@ -3420,11 +3420,11 @@ $as_echo_n "checking for Ruby include path... " >&6; }
             #  For some reason ruby 1.9.1 on linux seems to put its
             #  config.h file in ${ruby_path}/${ruby_arch}/ruby/config.h
             #  Aside from the fact that it is WRONG to include your own
-            #  config.h file it means we can't use the headers unless we
-            #  add both paths
+            #  config.h file, it means we can't use the headers unless we
+            #  add both paths.
             #
-            if test -d "${ruby_path}/${arch}"; then
-                ruby_path=" -I${ruby_path} -I${ruby_path}/${ruby_arch}"
+            if test -d "${ruby_path}/${ruby_arch}"; then
+                 ruby_path=" -I${ruby_path} -I${ruby_path}/${ruby_arch}"
             else
                  ruby_path=" -I${ruby_path}"
             fi
@@ -3550,7 +3550,6 @@ $as_echo "$rubyexists" >&6; }
   via the LDFLAGS environment variable.
   Example: ./configure LDFLAGS=\"-L/usr/non-standard-path/ruby/lib\"
   ============================================================================
-   ERROR!
    You probably have to install the development version of the Ruby package
    for your distribution.  The exact name of this package varies among them.
   ============================================================================
@@ -3561,7 +3560,6 @@ $as_echo "$as_me: WARNING:
   via the LDFLAGS environment variable.
   Example: ./configure LDFLAGS=\"-L/usr/non-standard-path/ruby/lib\"
   ============================================================================
-   ERROR!
    You probably have to install the development version of the Ruby package
    for your distribution.  The exact name of this package varies among them.
   ============================================================================
@@ -3576,7 +3574,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
     # turn back to default flags
     CFLAGS="$ac_save_CFLAGS"
-    LIBS="$ac_save_LDFLAGS"
+    LIBS="$ac_save_LIBS"
 
     #
     # all done!

diff --git a/src/modules/rlm_ruby/m4/ax_ruby_devel.m4 b/src/modules/rlm_ruby/m4/ax_ruby_devel.m4
index 27fcbeda9a9d2bde8644e61bac9efa6378d626ca..1ba3d074b39b6761254dabed3e26a6939632f949 100644 (file)
--- a/src/modules/rlm_ruby/m4/ax_ruby_devel.m4
+++ b/src/modules/rlm_ruby/m4/ax_ruby_devel.m4
@@ -96,11 +96,11 @@ $ac_distutils_result])
             #  For some reason ruby 1.9.1 on linux seems to put its
             #  config.h file in ${ruby_path}/${ruby_arch}/ruby/config.h
             #  Aside from the fact that it is WRONG to include your own
-            #  config.h file it means we can't use the headers unless we
-            #  add both paths
+            #  config.h file, it means we can't use the headers unless we
+            #  add both paths.
             #
-            if test -d "${ruby_path}/${arch}"; then
-                ruby_path=" -I${ruby_path} -I${ruby_path}/${ruby_arch}"
+            if test -d "${ruby_path}/${ruby_arch}"; then
+                 ruby_path=" -I${ruby_path} -I${ruby_path}/${ruby_arch}"
             else
                  ruby_path=" -I${ruby_path}"
             fi
@@ -196,7 +196,6 @@ $ac_distutils_result])
   via the LDFLAGS environment variable.
   Example: ./configure LDFLAGS="-L/usr/non-standard-path/ruby/lib"
   ============================================================================
-   ERROR!
    You probably have to install the development version of the Ruby package
    for your distribution.  The exact name of this package varies among them.
   ============================================================================
@@ -206,7 +205,7 @@ $ac_distutils_result])
     AC_LANG_POP
     # turn back to default flags
     CFLAGS="$ac_save_CFLAGS"
-    LIBS="$ac_save_LDFLAGS"
+    LIBS="$ac_save_LIBS"
 
     #
     # all done!