diff options
| -rw-r--r-- | macros/ChangeLog | 6 | ||||
| -rw-r--r-- | macros/gnome-fileutils.m4 | 24 | ||||
| -rw-r--r-- | macros/gnome-libgtop-sysdeps.m4 | 6 |
3 files changed, 30 insertions, 6 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index d07d16c025..beb92ea174 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,9 @@ +1998-07-22 Martin Baulig <martin@home-of-linux.org> + + * gnome-fileutils.m4: Added some reasonable defaults to allow + cross compiling; removed `mountlist.o' and `fsusage.o' from + LIBOBJS. + Tue Jul 21 23:44:53 1998 Tom Tromey <tromey@cygnus.com> * gnome-guile-checks.m4: If no build-guile, link against readline diff --git a/macros/gnome-fileutils.m4 b/macros/gnome-fileutils.m4 index 249f8dfcd2..ad1c7140dd 100644 --- a/macros/gnome-fileutils.m4 +++ b/macros/gnome-fileutils.m4 @@ -15,6 +15,26 @@ AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \ getcwd getmntinfo gettimeofday isascii lchown \ listmntent memcpy mkfifo strchr strerror strrchr vprintf) +dnl Set some defaults when cross-compiling + +if test x$cross_compiling = xyes ; then + case "$host_os" in + linux*) + fu_cv_sys_mounted_getmntent1=yes + fu_cv_sys_stat_statfs2_bsize=yes + ;; + sunos*) + fu_cv_sys_stat_statfs4=yes + ;; + freebsd*) + fu_cv_sys_stat_statfs2_bsize=yes + ;; + osf*) + fu_cv_sys_stat_statfs3_osf1=yes + ;; + esac +fi + # Determine how to get the list of mounted filesystems. list_mounted_fs= @@ -366,8 +386,8 @@ fi if test -n "$list_mounted_fs" && test $space != no; then DF_PROG="df" -LIBOBJS="$LIBOBJS fsusage.o" -LIBOBJS="$LIBOBJS mountlist.o" +# LIBOBJS="$LIBOBJS fsusage.o" +# LIBOBJS="$LIBOBJS mountlist.o" fi # Check for SunOS statfs brokenness wrt partitions 2GB and larger. diff --git a/macros/gnome-libgtop-sysdeps.m4 b/macros/gnome-libgtop-sysdeps.m4 index 2aa1688e75..cec72f847b 100644 --- a/macros/gnome-libgtop-sysdeps.m4 +++ b/macros/gnome-libgtop-sysdeps.m4 @@ -21,11 +21,10 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ [ --with-linux-table Use the table () function from Martin Baulig],[ linux_table="$withval"],[linux_table=auto]) - AC_MSG_CHECKING(for table function in Linux Kernel) - if test $linux_table = yes ; then AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no) elif test $linux_table = auto ; then + AC_MSG_CHECKING(for table function in Linux Kernel) AC_TRY_RUN([ #include <stdio.h> #include <stdlib.h> @@ -52,10 +51,9 @@ main (void) exit (ret < 1 ? ret : 0); } ], linux_table=yes, linux_table=no, linux_table=no) + AC_MSG_RESULT($linux_table) fi - AC_MSG_RESULT($linux_table) - if test $linux_table = yes ; then AC_DEFINE(HAVE_LINUX_TABLE) fi |