diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-vfs.m4 | 27 |
2 files changed, 30 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index d2243e59d6..1a50732f26 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 28 23:39:48 1999 Norbert Warmuth <nwarmuth@privat.circular.de> + + * gnome-vfs.m4: Add --with-vfs option. GNOME_VFS_LIBS still needs + to be fixed but that's not a problem because there's no libvfs, yet. + 1999-03-10 Tomislav Vujec <tvujec@carnet.hr> * aclocal-include.m4 (AM_ACLOCAL_INCLUDE): Add ACLOCAL_FLAGS in diff --git a/macros/gnome-vfs.m4 b/macros/gnome-vfs.m4 index 8460076948..cd701eb22c 100644 --- a/macros/gnome-vfs.m4 +++ b/macros/gnome-vfs.m4 @@ -5,9 +5,12 @@ dnl Sets GNOME_VFS_LIBS to libraries required dnl Sets termnet to true or false depending on whether it is required. dnl If yes, defines USE_TERMNET. dnl Sets vfs_flags to "pretty" list of vfs implementations we include. +dnl Sets shell variable use_vfs to yes (default, --with-vfs) or +dnl "no" (--without-vfs). dnl Calls AC_SUBST(mcserv), which is either empty or "mcserv". -AC_DEFUN([GNOME_VFS_CHECKS],[ +dnl Private define +AC_DEFUN([GNOME_WITH_VFS],[ dnl FIXME: network checks should probably be in their own macro. AC_CHECK_LIB(nsl, t_accept) AC_CHECK_LIB(socket, socket) @@ -34,7 +37,6 @@ AC_DEFUN([GNOME_VFS_CHECKS],[ done fi - vfs_flags="tarfs" use_net_code=false if test $have_socket = yes; then @@ -75,6 +77,27 @@ AC_DEFUN([GNOME_VFS_CHECKS],[ TERMNET="-ltermnet" fi fi + AC_SUBST(TERMNET) AC_SUBST(mcserv) + +dnl FIXME: +dnl GNOME_VFS_LIBS= + ]) + +AC_DEFUN([GNOME_VFS_CHECKS],[ + use_vfs=yes + AC_ARG_WITH(vfs, + [--with-vfs Compile with the VFS code], + use_vfs=$withval + ) + case $use_vfs in + yes) GNOME_WITH_VFS;; + no) use_vfs=no;; + *) use_vfs=no;; + dnl Should we issue a warning? + esac +]) + + |