Merge branch 'slimconfigure'

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

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index 92d8babcd21d1acad90ab3d6a26eb379d0f63d8f..ba869070d501cdf3c7f03559d978caf95b093e81 100644 (file)
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -20,8 +20,8 @@ AC_DEFUN(PSI_CONFIG_INIT, [
        ])
        
        AC_MSG_CHECKING(for preprocessor defaults)
-       psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE - </dev/null`
-       psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE - </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
@@ -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