diff options
| author | Norbert Warmuth <nwarmuth@privat.circular.de> | 1999-03-29 05:06:57 +0000 |
|---|---|---|
| committer | Norbert Warmuth <norbert@src.gnome.org> | 1999-03-29 05:06:57 +0000 |
| commit | 02ef8776842c7073a178682b7b6d8a2ce5c26d50 (patch) | |
| tree | 0ba5137a16a5e276afd18a7937e807c7346dc984 | |
| parent | 15fe5044403c17ab7c83756131e7ba617e6e7b2a (diff) | |
| download | gnome-common-02ef8776842c7073a178682b7b6d8a2ce5c26d50.tar.gz | |
Deleted duplicate VFS checks. GNOME_VFS_CHECKS now contains all VFS
Sun Mar 28 23:39:48 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* configure.in: Deleted duplicate VFS checks. GNOME_VFS_CHECKS
now contains all VFS checks.
* src/util.c (is_printable): Character 155 is non printable even when
full eight bit output is enabled (on the linux console 155 is
interpreted as "ESC [").
* vfs/vfs.h (vfs_translate_url): Fixed the macro which is used when
compiling without vfs.
* macros/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.
svn path=/trunk/; revision=730
| -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 d2243e5..1a50732 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 8460076..cd701eb 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 +]) + + |