Revert "Fix cache handling"

This reverts commit 0ad6cd85c709efb43673cea4d24e2ad652f49f27.

build/autotools/includes/acinclude.m4

@@ -216,18 +216,15 @@ dnl @summary check whether compiler requires -rpath for libstdc++.so
 AC_DEFUN([CXX_RPATH_CHECK],
 [
   AC_CACHE_CHECK([whether the compiler requires -rpath], ax_cv_prog_cc_rpath, [
-    ax_cv_prog_cc_rpath=no
+    ax_cv_prog_cc_rpath=
     for path in `${CXX} -print-search-dirs | awk '/^libraries:/ {print substr([$]0, 13)}' | tr ':' ' '`; do
       if [[ -r "${path}/libstdc++.so" ]]; then
         ax_cv_prog_cc_rpath="${path}"
+        LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-Wl,-rpath,${path}"
         break
       fi
     done
   ])
-
-  if [ "${ax_cv_prog_cc_rpath}" != "no" ]; then
-    LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-Wl,-rpath,${path}"
-  fi
 ])
 
 dnl  EGG_CHECK_CCSTATIC()

configure

@@ -3357,10 +3357,11 @@ if ${ax_cv_prog_cc_rpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-    ax_cv_prog_cc_rpath=no
+    ax_cv_prog_cc_rpath=
     for path in `${CXX} -print-search-dirs | awk '/^libraries:/ {print substr($0, 13)}' | tr ':' ' '`; do
       if [ -r "${path}/libstdc++.so" ]; then
         ax_cv_prog_cc_rpath="${path}"
+        LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-Wl,-rpath,${path}"
         break
       fi
     done
@@ -3369,10 +3370,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_prog_cc_rpath" >&5
 $as_echo "$ax_cv_prog_cc_rpath" >&6; }
 
-  if  "${ax_cv_prog_cc_rpath}" != "no" ; then
-    LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-Wl,-rpath,${path}"
-  fi
-
 
 #checkpoint
 cat >confcache <<\_ACEOF