From 608080a2f755254a590b4d052451461294fbcee4 Mon Sep 17 00:00:00 2001
From: William Jon McCann <mccann@jhu.edu>
Date: Tue, 13 Mar 2007 14:34:32 -0400
Subject: add a new configure option --with-slibdir to use for connector

Turns out that just using libdir breaks the .pc file install.
---
 configure.ac                       | 15 +++++++++++++++
 libck-connector/Makefile.am        |  3 ++-
 libck-connector/ck-connector.pc.in |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index fce1ff9..ac3a1ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,20 @@ if test "x$enable_pam_module" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_PAM_MODULE, test "x$enable_pam_module" = "xyes")
 
+dnl ---------------------------------------------------------------------------
+dnl - Install directory for connector
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(slibdir,
+              [AC_HELP_STRING([--with-slibdir=<dir>],
+              [directory to install system libraries])])
+if ! test -z "$with_slibdir"; then
+   SLIBDIR="$with_slibdir"
+else
+   SLIBDIR="$libdir"
+fi
+AC_SUBST(SLIBDIR)
+
 dnl ---------------------------------------------------------------------------
 dnl - Where should we put documentation ?
 dnl ---------------------------------------------------------------------------
@@ -323,6 +337,7 @@ echo "
         libdir:                   ${LIBDIR}
         bindir:                   ${BINDIR}
         sbindir:                  ${SBINDIR}
+        slibdir:                  ${SLIBDIR}
         sysconfdir:               ${SYSCONFDIR}
         localstatedir:            ${LOCALSTATEDIR}
         datadir:                  ${DATADIR}
diff --git a/libck-connector/Makefile.am b/libck-connector/Makefile.am
index 757c41e..e6801fd 100644
--- a/libck-connector/Makefile.am
+++ b/libck-connector/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = 				\
 	$(LIBDBUS_CFLAGS)		\
 	$(NULL)
 
-lib_LTLIBRARIES = 			\
+slibdir = $(SLIBDIR)
+slib_LTLIBRARIES = 			\
 	libck-connector.la		\
 	$(NULL)
 
diff --git a/libck-connector/ck-connector.pc.in b/libck-connector/ck-connector.pc.in
index a93d7a9..eacf5ce 100644
--- a/libck-connector/ck-connector.pc.in
+++ b/libck-connector/ck-connector.pc.in
@@ -1,4 +1,4 @@
-libdir=@libdir@
+libdir=@SLIBDIR@
 includedir=@prefix@/include
 
 Name: ck-connector
-- 
cgit