[conduit] fix build

[John Stowers <jstowers src gnome org>]

commit ed62e4727804aede8dd2b1e645a8e3f455a2978d
Author: John Stowers <john stowers gmail com>
Date:   Thu Jan 21 19:13:15 2010 +0100

    fix build

 INSTALL      |   17 ++++++++++++++---
 configure.ac |   15 ---------------
 2 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index 8b82ade..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +174,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
diff --git a/configure.ac b/configure.ac
index 1a8938b..657482e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,21 +186,6 @@ conduit/modules/iPodModule/Makefile
 conduit/modules/SmugMugModule/Makefile
 conduit/modules/SmugMugModule/SmugMugAPI/Makefile
 conduit/modules/GoogleModule/Makefile
-conduit/modules/GoogleModule/atom/Makefile
-conduit/modules/GoogleModule/gdata/Makefile
-conduit/modules/GoogleModule/gdata/apps/Makefile
-conduit/modules/GoogleModule/gdata/base/Makefile
-conduit/modules/GoogleModule/gdata/blogger/Makefile
-conduit/modules/GoogleModule/gdata/calendar/Makefile
-conduit/modules/GoogleModule/gdata/codesearch/Makefile
-conduit/modules/GoogleModule/gdata/contacts/Makefile
-conduit/modules/GoogleModule/gdata/docs/Makefile
-conduit/modules/GoogleModule/gdata/exif/Makefile
-conduit/modules/GoogleModule/gdata/geo/Makefile
-conduit/modules/GoogleModule/gdata/media/Makefile
-conduit/modules/GoogleModule/gdata/photos/Makefile
-conduit/modules/GoogleModule/gdata/spreadsheet/Makefile
-conduit/modules/GoogleModule/gdata/youtube/Makefile
 conduit/modules/ShutterflyModule/Makefile
 conduit/modules/ShutterflyModule/shutterfly/Makefile
 conduit/modules/RhythmboxModule/Makefile