diff options
| author | Michael Meeks <mmeeks@src.gnome.org> | 1999-07-02 08:32:15 +0000 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 1999-07-02 08:32:15 +0000 |
| commit | 779dceabda4736606842b7c88f9a1c01a0de8d50 (patch) | |
| tree | 465bd9eb421c28d100786a3eef063e63a5a09b7b | |
| parent | 18bcf04b8d3497421db14bb599e5c7a4e2203d45 (diff) | |
| download | gnome-common-779dceabda4736606842b7c88f9a1c01a0de8d50.tar.gz | |
Updated ( but still not working name support )
svn path=/branches/GNUMERIC_NAMES/; revision=838
| -rw-r--r-- | macros/ChangeLog | 10 | ||||
| -rw-r--r-- | macros/compiler-flags.m4 | 2 | ||||
| -rw-r--r-- | macros/gnome-guile-checks.m4 | 4 | ||||
| -rw-r--r-- | macros/gnome-vfs.m4 | 17 |
4 files changed, 30 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 8f978eb..aadbbba 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,13 @@ +Sat Jun 26 01:47:53 1999 Tim Janik <timj@gtk.org> + + * compiler-flags.m4: give -Wunused to gcc instead of -Wno-unused. + +1999-06-11 Tuomas J. Lukka <lukka@iki.fi> + + * gnome-guile-checks.m4: Debian has qt_null in -lqthreads but + no main. Changed both checks for 'main' to qt_null. + I hope this is correct - it shouldn't break anything. + 1999-05-11 Raja R Harinath <harinath@cs.umn.edu> * Makefile.am (MACROS): Add `gnome-bonobo-check.m4'. diff --git a/macros/compiler-flags.m4 b/macros/compiler-flags.m4 index 951aab7..278d509 100644 --- a/macros/compiler-flags.m4 +++ b/macros/compiler-flags.m4 @@ -15,7 +15,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[ if test "x$GCC" = "xyes"; then case " $CFLAGS " in *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCFLAGS="-Wall -Wno-unused" ;; + *) warnCFLAGS="-Wall -Wunused" ;; esac ## -W is not all that useful. And it cannot be controlled diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4 index f858f65..1086d30 100644 --- a/macros/gnome-guile-checks.m4 +++ b/macros/gnome-guile-checks.m4 @@ -10,7 +10,7 @@ AC_DEFUN([GNOME_CHECK_GUILE], saved_cppflags="$CPPFLAGS" LDFLAGS="$LDFLAGS $GNOME_LIBDIR" - AC_CHECK_LIB(qthreads,main,[ + AC_CHECK_LIB(qthreads,qt_null,[ QTTHREADS_LIB="-lqthreads" ],[ AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt") @@ -71,7 +71,7 @@ AC_DEFUN([GNOME_CHECK_GUILE], GUILE_LIBS="$GNOME_LIBDIR" GUILE_INCS="$GNOME_INCLUDEDIR" AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS") - AC_CHECK_LIB(qt, main, GUILE_LIBS="-lqt $GUILE_LIBS") + AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS") AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS") AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl") AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket") diff --git a/macros/gnome-vfs.m4 b/macros/gnome-vfs.m4 index cd701eb..137a39d 100644 --- a/macros/gnome-vfs.m4 +++ b/macros/gnome-vfs.m4 @@ -54,6 +54,23 @@ AC_DEFUN([GNOME_WITH_VFS],[ fi dnl + dnl Samba support + dnl + smbfs="" + SAMBAFILES="" + AC_ARG_WITH(samba, + [--with-samba Support smb virtual file system],[ + if test "x$withval != xno"; then + AC_DEFINE(WITH_SMBFS) + vfs_flags="$vfs_flags, smbfs" + smbfs="smbfs.o" + SAMBAFILES="\$(SAMBAFILES)" + fi + ]) + AC_SUBST(smbfs) + AC_SUBST(SAMBAFILES) + + dnl dnl The termnet support dnl termnet=false |