reviewed by: Ian McKellar <ian@eazel.com>

	* Makefile.am, configure.in, nautilus-config.in, nautilus.spec.in,
	nautilusConf.sh.in, .cvsignore: Add nautilus-config and
	nautilusConf.sh so other modules can sensibly depend on
	libnautilus (this fix should make it into 1.0.2, I guess I should
	file a bug at some point).

7 files changed, 114 insertions, 2 deletions

diff --git a/.cvsignore b/.cvsignore
index 59ff385ea..9d72e3872 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,8 +16,11 @@ libtool
 ltconfig
 ltmain.sh
 nautilus-*.tar.gz
-nautilus.spec
+nautilus-config
+nautilus-installer.spec
 nautilus.desktop
+nautilus.spec
+nautilusConf.sh
 obj
 po
 stamp-h
@@ -28,4 +31,3 @@ xml-i18n-merge
 xml-i18n-merge.in
 xml-i18n-update
 xml-i18n-update.in
-nautilus-installer.spec
diff --git a/ChangeLog b/ChangeLog
index d7b3b7ca8..0ccedc802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-20  Maciej Stachowiak  <mjs@eazel.com>
+
+	reviewed by: Ian McKellar  <ian@eazel.com>
+
+	* Makefile.am, configure.in, nautilus-config.in, nautilus.spec.in,
+	nautilusConf.sh.in, .cvsignore: Add nautilus-config and
+	nautilusConf.sh so other modules can sensibly depend on
+	libnautilus (this fix should make it into 1.0.2, I guess I should
+	file a bug at some point).
+
 2001-03-20  Ramiro Estrugo  <ramiro@eazel.com>
 
 	reviewed by: Pavel Cisler  <pavel@eazel.com>
diff --git a/Makefile.am b/Makefile.am
index 48290bb94..2eb25f055 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,8 @@ EXTRA_DIST=					\
 	nautilus.desktop			\
 	nautilus.desktop.in			\
 	nautilus-launch-icon.png		\
+	nautilusConf.sh.in			\
+	nautilus-config.in			\
 	ChangeLog-20000414			\
 	ChangeLog-20000625			\
 	ChangeLog-20000831			\
@@ -62,6 +64,40 @@ appicon_DATA = nautilus-launch-icon.png
 Applicationsdir = $(datadir)/gnome/apps/Applications
 Applications_DATA = $(DESKTOP_FILES)
 
+
+
+## [The following is shamelessly copied from gnome-vfs.]
+
+## We create `nautilusConf.sh' here and not from configure because we
+## want to get the paths expanded correctly.  Macros like srcdir are
+## given the value NONE in configure if the user doesn't specify them
+## (this is an autoconf feature, not a bug).
+
+bin_SCRIPTS = $(top_builddir)/nautilus-config
+
+confexecdir=$(libdir)
+confexec_DATA =					\
+	nautilusConf.sh				\
+	$(NULL)
+
+nautilusConf.sh: nautilusConf.sh.in Makefile
+	sed -e 's?\@NAUTILUS_LIBDIR\@?$(NAUTILUS_LIBDIR)?g' \
+	    -e 's?\@NAUTILUS_INCLUDEDIR\@?$(NAUTILUS_INCLUDEDIR)?g' \
+	    -e 's?\@VERSION\@?$(VERSION)?g' \
+	    -e 's?\@NAUTILUS_LIBS\@?$(NAUTILUS_LIBS)?g' \
+	      < $(srcdir)/nautilusConf.sh.in > nautilusConf.tmp \
+	  && mv nautilusConf.tmp nautilusConf.sh
+
+nautilus-config: nautilus-config.in Makefile
+	sed -e 's?\@LIBDIR\@?$(libdir)?g' \
+	    -e 's?\@NAUTIlUS_LIBDIR\@?$(NAUTILUS_LIBDIR)?g' \
+	    -e 's?\@NAUTILUS_INCLUDEDIR\@?$(NAUTILUS_INCLUDEDIR)?g' \
+	    -e 's?\@VERSION\@?$(VERSION)?g' \
+	    -e 's?\@NAUTILUS_LIBS\@?$(NAUTILUS_LIBS)?g' \
+	      < $(srcdir)/nautilus-config.in > nautilus-config.tmp \
+	  && mv nautilus-config.tmp nautilus-config && \
+		chmod 755 nautilus-config
+
 ##################################################################
 #
 # eazel-logos/*, if it exists
diff --git a/configure.in b/configure.in
index 27c7c6645..eab832b17 100644
--- a/configure.in
+++ b/configure.in
@@ -901,6 +901,23 @@ dnl =======================
 dnl = End tests for libpng
 dnl =======================
 
+
+dnl =======================
+dnl = Set up for library directories
+dnl =======================
+
+NAUTILUS_LIBS="-lnautilus `gnome-config --libs bonobox gnomeui gtk vfs`"
+NAUTILUS_LIBDIR='-L${libdir}'
+NAUTILUS_INCLUDEDIR='-I${includedir} '" `gnome-config --cflags bonobox gnomeui gtk vfs`"
+AC_SUBST(NAUTILUS_LIBDIR)
+AC_SUBST(NAUTILUS_INCLUDEDIR)
+AC_SUBST(NAUTILUS_LIBS)
+
+dnl =======================
+dnl = End set up for library directories
+dnl =======================
+
+
 dnl Checks for i18n
 ALL_LINGUAS="az ca da de el en_GB es fi fr ga gl hu it ja ko nl nn no pl pt_BR ru sk sl sv ta tr uk zh_TW.Big5"
 AM_GNOME_GETTEXT
diff --git a/nautilus-config.in b/nautilus-config.in
new file mode 100644
index 000000000..339dfe2a3
--- /dev/null
+++ b/nautilus-config.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+usage="\
+    Usage: nauilus-config [--version] [--config] [--cflags] [--libs]"
+
+config_file="@LIBDIR@/nautilusConf.sh"
+. $config_file
+
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --version)
+      echo @VERSION@
+      ;;
+    --config)
+      echo $config_file
+      ;;
+    --cflags)
+      echo $NAUTILUS_INCLUDEDIR
+      ;;
+    --libs)
+      echo "$NAUTILUS_LIBDIR $NAUTILUS_LIBS"
+      ;;
+    *)
+      echo "${usage}" 1>&2
+      exit 1
+  esac
+  shift
+done
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 5d397cc9e..9cb735432 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -274,6 +274,8 @@ scrollkeeper-update
 %defattr(0555, bin, bin)
 %{prefix}/lib/*.la
 %{prefix}/lib/vfs/modules/*.la
+%{prefix}/lib/*.sh
+%{prefix}/bin/nautilus-config
 
 %defattr(0444, bin, bin)
 %{prefix}/include/libtrilobite/eazel/*/*.h
diff --git a/nautilusConf.sh.in b/nautilusConf.sh.in
new file mode 100644
index 000000000..584d96159
--- /dev/null
+++ b/nautilusConf.sh.in
@@ -0,0 +1,7 @@
+#
+#  Configuration file for using the nautilus library
+#
+NAUTILUS_LIBDIR="@NAUTILUS_LIBDIR@"
+NAUTILUS_LIBS="@NAUTILUS_LIBS@"
+NAUTILUS_INCLUDEDIR="@NAUTILUS_INCLUDEDIR@"
+MODULE_VERSION="nautilus-@VERSION@"