Merge branch 'slimconfigure'

[m6w6/ext-psi] / m4 / psi / psi.m4

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index 984aa6064743c765f5fec1fd99a88c61359ed4af..ba869070d501cdf3c7f03559d978caf95b093e81 100644 (file)
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -20,14 +20,14 @@ AC_DEFUN(PSI_CONFIG_INIT, [
        ])
        
        AC_MSG_CHECKING(for preprocessor defaults)
-       psi_cpp_predef=`$CPP -Wp,-dM - </dev/null`
-       psi_cpp_search=`$CPP -Wp,-v - </dev/null 2>&1 >/dev/null \
+       psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null`
+       psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null 2>&1 >/dev/null \
                | $AWK '
                        /include.*search.*start/ { 
                                capture = 1
                                next
                        }
-                       /[Ee]nd.*search/ {
+                       /@<:@Ee@:>@nd.*search/ {
                                capture = 0
                        }
                        { 
@@ -106,7 +106,9 @@ AC_DEFUN(PSI_CONFIG_DONE, [
        
        if $PSI_FAST_CONFIG; then
                for conf_env in $PSI_CONFIG_TMP/*/conf.env; do
-                       source $conf_env
+                       if test "$conf_env" != "$PSI_CONFIG_TMP/*/conf.env"; then
+                               source $conf_env
+                       fi
                done
        fi