[sword-cvs] sword Makefile.am,1.34,1.35 configure.ac,1.25,1.26

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv9126

Modified Files:
	Makefile.am configure.ac 
Log Message:

dglassey: make pkgconfig bits optional so it still builds if you don't have it


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile.am	11 Jul 2003 17:33:19 -0000	1.34
+++ Makefile.am	11 Jul 2003 22:06:37 -0000	1.35
@@ -81,11 +81,12 @@
 INCLUDES = -I $(top_srcdir)/include
 EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh sword.pc.in
 
+if USE_PKGCONF
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = sword.pc
 
 $(pkgconfig_DATA): config.status
-
+endif
 
 if INSTCONF
 sysconf_DATA = sword.conf

Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.ac	11 Jul 2003 17:33:19 -0000	1.25
+++ configure.ac	11 Jul 2003 22:06:37 -0000	1.26
@@ -55,15 +55,20 @@
 # ---------------------------------------------------------------------
 # Find pkg-config
 # ---------------------------------------------------------------------
+use_pkgconfig=yes
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test x$PKG_CONFIG = xno ; then
-  AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
+  AC_MSG_WARN([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
+  AC_MSG_WARN([not using pkg-config])
+  use_pkgconfig=no
 fi
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
   :
 else
-  AC_MSG_ERROR([*** pkg-config too old; version 0.14 or better required.])
+  AC_MSG_WARN([*** pkg-config too old; version 0.14 or better required.])
+  AC_MSG_WARN([not using pkg-config])
+  use_pkgconfig=no
 fi
 
 
@@ -226,6 +231,7 @@
 AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes)
 AM_CONDITIONAL(INSTALLMGR, test x$with_curl = xyes)
 AM_CONDITIONAL(CONFDEF, test x$dir_confdef = xyes)
+AM_CONDITIONAL(USE_PKGCONF, test x$use_pkgconfig = xyes)
 #AM_CONDITIONAL(DEBUG, test x$with_debug = xyes)
 #AM_CONDITIONAL(PROFILE, test x$with_profile = xyes)
 AM_CONDITIONAL(BUILDTESTS, test x$enable_tests = xyes)