[Apcupsd-commits] apcupsd/autoconf configure.in,1.123,1.124

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/autoconf
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8052/autoconf

Modified Files:
	configure.in 
Log Message:
Remove gapcmon dependency on GnomeVFS.


Index: configure.in
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/autoconf/configure.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- configure.in	17 Dec 2006 17:35:24 -0000	1.123
+++ configure.in	31 Jan 2007 00:33:18 -0000	1.124
@@ -915,47 +915,8 @@
         dnl
         dnl Check for Gnome packages
         dnl
-        PKG_CHECK_MODULES(GAPCMON, gtk+-2.0 >= 2.4.0 glib-2.0 gthread-2.0 gconf-2.0 gnome-vfs-module-2.0)
+        PKG_CHECK_MODULES(GAPCMON, gtk+-2.0 >= 2.4.0 glib-2.0 gthread-2.0 gconf-2.0)
         GAPCMON_CFLAGS="$GAPCMON_CFLAGS -DVERSION=\\\"$VERSION\\\""
-
-        dnl
-        dnl Check if gnome_vfs_socket_{read,write} requires 5th argument, 'cancellation'
-        dnl
-        _cflags=${CFLAGS}
-        _libs=${LIBS}
-        CFLAGS="${CFLAGS} ${GAPCMON_CFLAGS}"
-        LIBS="${LDFLAGS} ${GAPCMON_LIBS}"
-        AC_MSG_CHECKING(if gnome_vfs_socket_read requires cancellation argument)
-        AC_LINK_IFELSE(
-           AC_LANG_PROGRAM([#include <libgnomevfs/gnome-vfs.h>],
-                           [gnome_vfs_socket_read(NULL, NULL, 0, NULL, NULL);]),
-           [ AC_MSG_RESULT(yes)
-             GAPCMON_CFLAGS="${GAPCMON_CFLAGS} -DGNOMEVFS_REQUIRES_CANCELLATION" ],
-           AC_MSG_RESULT(no))
-        CFLAGS=${_cflags}
-        LIBS=${_libs}
-      
-      dnl
-      dnl Check for gnome_vfs_socket_set_timeout
-      dnl
-      _cflags=${CFLAGS}
-      _libs=${LIBS}
-      CFLAGS="${CFLAGS} ${GAPCMON_CFLAGS}"
-      LIBS="${LDFLAGS} ${GAPCMON_LIBS}"
-      AC_MSG_CHECKING(for gnome_vfs_socket_set_timeout)
-         AC_LINK_IFELSE(
-            AC_LANG_PROGRAM([#include <libgnomevfs/gnome-vfs.h>
-                             #ifdef GNOMEVFS_REQUIRES_CANCELLATION
-                             #define GNOMEVFS_CANCELLATION ,NULL
-                             #else
-                             #define GNOMEVFS_CANCELLATION
-                             #endif],
-                            [gnome_vfs_socket_set_timeout(NULL, NULL GNOMEVFS_CANCELLATION);]),
-         [ AC_MSG_RESULT(yes)
-           GAPCMON_CFLAGS="${GAPCMON_CFLAGS} -DHAVE_GNOMEVFS_SOCKET_SET_TIMEOUT" ],
-         AC_MSG_RESULT(no))
-      CFLAGS=${_cflags}
-      LIBS=${_libs}
    fi],
   [])
 AC_SUBST(GAPCMON)