omf-install/Makefile.am (scrollkeeper_localstate_dir) use

2001-08-19  Chris Toshok  <toshok@ximian.com>

        * omf-install/Makefile.am (scrollkeeper_localstate_dir) use
        $(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
        evolution's local state dir.  this should fix the core dumps
        during install on freebsd and solaris.

        * configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
        otherwise default to glib-config.  a cheap solution to get this
        working on freebsd (where they have glib12-config, but not
        glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
        (SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
        this out, and AC_SUBST so omf-install/Makefile.am can use it.

svn path=/trunk/; revision=12227

3 files changed, 22 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f76c2136d..7870a04b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-08-19  Chris Toshok  <toshok@ximian.com>
+
+	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use
+	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
+	evolution's local state dir.  this should fix the core dumps
+	during install on freebsd and solaris.
+
+	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
+	otherwise default to glib-config.  a cheap solution to get this
+	working on freebsd (where they have glib12-config, but not
+	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
+	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
+	this out, and AC_SUBST so omf-install/Makefile.am can use it.
+
 2001-08-17  Iain Holmes  <iain@ximian.com>
 
 	* Makefile.am: Move the libical compile order.
diff --git a/configure.in b/configure.in
index 92f3a26a70..059794cf2b 100644
--- a/configure.in
+++ b/configure.in
@@ -67,6 +67,8 @@ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
 if test x$SCROLLKEEPER_CONFIG = xno; then
   AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
 fi
+SCROLLKEEPER_LOCALSTATE_DIR=`scrollkeeper-config --pkglocalstatedir`
+AC_SUBST(SCROLLKEEPER_LOCALSTATE_DIR)
 
 dnl  Test whether jw is installed
 AC_PATH_PROG(JW,jw,no)
@@ -499,6 +501,7 @@ dnl Hah! Threads are no longer an option
 dnl AC_ARG_WITH(threads, [  --with-threads          Include thread support],[
 dnl FIXME: support more thread types, pth at least
 
+GLIB_CONFIG=${GLIB_CONFIG-glib-config}
 GNOME_PTHREAD_CHECK
 
 if test "x$PTHREAD_LIB" = "x" ; then
@@ -510,8 +513,8 @@ dnl Notice that this is a hack, and we wont be able to use this forever, but
 dnl at least for some time
 dnl
 
-THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
-THREADS_CFLAGS="`glib-config --cflags gthread`"
+THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"
+THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"
 
 AC_SUBST(THREADS_LIBS)
 AC_SUBST(THREADS_CFLAGS)
@@ -579,8 +582,8 @@ EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.6)
 dnl *************************
 dnl CFLAGS and LIBS and stuff
 dnl *************************
-GLIB_CFLAGS="`glib-config --cflags`"
-GLIB_LIBS="`glib-config --libs`"
+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
+GLIB_LIBS="`$GLIB_CONFIG --libs`"
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
diff --git a/omf-install/Makefile.am b/omf-install/Makefile.am
index ee542a8598..dbd8e62240 100644
--- a/omf-install/Makefile.am
+++ b/omf-install/Makefile.am
@@ -1,5 +1,5 @@
 omf_dest_dir=$(datadir)/omf/evolution
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+scrollkeeper_localstate_dir = $(SCROLLKEEPER_LOCALSTATE_DIR)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)