diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-11-01 03:26:03 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-11-01 03:26:03 +0000 |
| commit | bbc1e5427b0bea67b8ab491b71df60c2698e8331 (patch) | |
| tree | a16e6d74ec3e60e0b15801ed78349a163c99b16f | |
| parent | 346ca80df9e94180694be1d363b99b6f4098422b (diff) | |
| download | nautilus-bbc1e5427b0bea67b8ab491b71df60c2698e8331.tar.gz | |
Add applets to SUBDIRS if needed.
* Makefile.am:
Add applets to SUBDIRS if needed.
* applets/Makefile.am:
Tiny bit of cleanup.
* configure.in:
Define HAVE_APPLETS only if the applets devel libs are found by
gnome-config.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | applets/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.in | 16 |
4 files changed, 34 insertions, 7 deletions
@@ -1,5 +1,17 @@ 2000-10-31 Ramiro Estrugo <ramiro@eazel.com> + * Makefile.am: + Add applets to SUBDIRS if needed. + + * applets/Makefile.am: + Tiny bit of cleanup. + + * configure.in: + Define HAVE_APPLETS only if the applets devel libs are found by + gnome-config. + +2000-10-31 Ramiro Estrugo <ramiro@eazel.com> + * components/mozilla/nautilus-mozilla-content-view.c: (nautilus_mozilla_content_view_load_uri), (mozilla_content_view_one_time_happenings): diff --git a/Makefile.am b/Makefile.am index c5e749a24..b1954a500 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/Makefile.shared +if HAVE_APPLETS +APPLETS_SUBDIRS = applets +endif + SUBDIRS = \ data \ icons \ @@ -12,6 +16,7 @@ SUBDIRS = \ helper-utilities \ src \ components \ + $(APPLETS_SUBDIRS) \ test \ user-guide \ po \ @@ -49,3 +54,6 @@ install-data-hook: nautilus-clean.sh $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ else :; fi; \ done + +caca: + @echo $(APPLETS_SUBDIRS) diff --git a/applets/Makefile.am b/applets/Makefile.am index 42b7c6ee3..52a1083e2 100644 --- a/applets/Makefile.am +++ b/applets/Makefile.am @@ -1,6 +1,5 @@ include $(top_srcdir)/Makefile.shared -SUBDIRS = \ - launcher \ +SUBDIRS = \ + launcher \ $(NULL) - diff --git a/configure.in b/configure.in index 946ed6925..95cfb4679 100644 --- a/configure.in +++ b/configure.in @@ -502,11 +502,14 @@ dnl ==================================== dnl = begin applet checks dnl ==================================== AC_MSG_CHECKING(for applets) -APPLETS_CFLAGS="" -APPLETS_LIBS="" +APPLETS_CFLAGS= +APPLETS_LIBS= HAVE_APPLETS="no" -if test -n `gnome-config --modversion applets` ; then +gnome-config | grep applets > /dev/null 2>&1 + +if test $? -eq 0 +then HAVE_APPLETS="yes" APPLETS_CFLAGS=`gnome-config --cflags applets` APPLETS_LIBS=`gnome-config --libs applets` @@ -514,9 +517,10 @@ if test -n `gnome-config --modversion applets` ; then else HAVE_APPLETS="no" AC_MSG_RESULT(no) - AC_MSG_ERROR(Could not find applets library. Make sure you have installed the gnome-core package.) fi +AM_CONDITIONAL(HAVE_APPLETS, test "x$HAVE_APPLETS" = "xyes") + AC_SUBST(HAVE_APPLETS) AC_SUBST(APPLETS_CFLAGS) AC_SUBST(APPLETS_LIBS) @@ -861,4 +865,8 @@ echo " EAZEL_BUILD_TIMESTAMP : $EAZEL_BUILD_TIMESTAMP" echo +echo " +HAVE_APPLETS : $HAVE_APPLETS" +echo + dnl <= End of configuration summary => |