diff options
| author | J Shane Culpepper <pepper@src.gnome.org> | 2000-05-15 19:08:57 +0000 |
|---|---|---|
| committer | J Shane Culpepper <pepper@src.gnome.org> | 2000-05-15 19:08:57 +0000 |
| commit | 5acee5829de1cc53f916399b32cc031d22f0de4a (patch) | |
| tree | 99a3ddd2a265ca9dda0f456fdea7bf8432d1320a | |
| parent | e259c55ee9ae0655cf850038c187c0c77cd27853 (diff) | |
| download | nautilus-5acee5829de1cc53f916399b32cc031d22f0de4a.tar.gz | |
Adding the gnom-http dep.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | HACKING | 7 | ||||
| -rw-r--r-- | components/services/startup/nautilus-view/Makefile.am | 3 | ||||
| -rw-r--r-- | components/services/trilobite/sample/nautilus-view/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 17 |
5 files changed, 36 insertions, 4 deletions
@@ -1,3 +1,13 @@ +2000-05-15 J Shane Culpepper <pepper@eazel.com> + + * HACKING: Added new gnome-http dep. Minor fixes to order to jive + with our current build env. + * components/services/startup/nautilus-view/Makefile.am: Removed + hardcoded -lghttp + * components/services/trilobite/sample/nautilus-view/Makefile.am: + Removed hardcoded -lghttp + * configure.in: Added test for ghttp since it is now a dependancy. + 2000-05-15 Darin Adler <darin@eazel.com> First cut at metadata cleanup in preparation for fixing bug @@ -18,18 +18,21 @@ module branch configure options ------ ------ ----------------- glib: glib-1-2 gtk+: gtk-1-2 +imlib: HEAD gnome-xml: LIB_XML_1_X ORBit: orbit-stable-0-5 +gnome-libs: gnome-libs-1-0 --enable-prefer-db1 +gnet: HEAD +gnome-http: HEAD oaf: HEAD gconf: HEAD -gnome-libs: gnome-libs-1-0 gdk-pixbuf: HEAD --enable-canvas-pixbuf gnome-print: HEAD bonobo: HEAD --enable-oaf=yes gnome-vfs: HEAD --enable-oaf=yes gtkhtml: HEAD eog: HEAD --enable-oaf=yes -gnet: HEAD +xpdf: HEAD Other modules for Red Hat users: diff --git a/components/services/startup/nautilus-view/Makefile.am b/components/services/startup/nautilus-view/Makefile.am index 2920feee6..c97a10209 100644 --- a/components/services/startup/nautilus-view/Makefile.am +++ b/components/services/startup/nautilus-view/Makefile.am @@ -13,6 +13,7 @@ INCLUDES = \ -I$(top_builddir) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ + $(GHTTP_CFLAGS) \ $(WERROR) \ $(NULL) @@ -41,7 +42,7 @@ nautilus_service_startup_view_LDADD = \ $(GNOMEUI_LIBS) \ $(GCONF_LIBS) \ $(VFS_LIBS) \ - -lghttp \ + $(GHTTP_LIBS) \ $(OAF_LIBS) \ $(top_builddir)/components/services/startup/lib/libstartup.a \ $(NULL) diff --git a/components/services/trilobite/sample/nautilus-view/Makefile.am b/components/services/trilobite/sample/nautilus-view/Makefile.am index 1cd051083..48a25c4c7 100644 --- a/components/services/trilobite/sample/nautilus-view/Makefile.am +++ b/components/services/trilobite/sample/nautilus-view/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ -I$(top_builddir) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ + $(GHTTP_CFLAGS) \ $(WERROR) \ $(NULL) @@ -40,7 +41,7 @@ nautilus_eazel_sample_service_view_LDFLAGS = \ $(GNOMEUI_LIBS) \ $(GCONF_LIBS) \ $(VFS_LIBS) \ - -lghttp \ + $(GHTTP_LIBS) \ $(OAF_LIBS) \ $(NULL) diff --git a/configure.in b/configure.in index c3c138a3a..0871f684d 100644 --- a/configure.in +++ b/configure.in @@ -206,6 +206,23 @@ dnl = end gnet checks dnl ==================================== dnl ==================================== +dnl = begin gnome-http checks +dnl ==================================== + +AC_PATH_PROG(GHTTP_CONFIG,ghttp-config,no) +if test x$GHTTP_CONFIG = xno; then + AC_MSG_ERROR(Could not find ghttp libraries.) +fi +GHTTP_LIBS=`$GHTTP_CONFIG --libs` +GHTTP_CFLAGS=`$GHTTP_CONFIG --cflags` +AC_SUBST(GHTTP_LIBS) +AC_SUBST(GHTTP_CFLAGS) + +dnl ==================================== +dnl = end ghttp checks +dnl ==================================== + +dnl ==================================== dnl = begin gdk-pixbuf checks dnl ==================================== AM_PATH_GDK_PIXBUF(0.7.0,, |