[sword-cvs] sword Makefile.am,1.33,1.34 configure.ac,1.24,1.25

[sword@www.crosswire.org]

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

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

dglassey: more makefile work
include doc and cgi bits in make distribution
use the sword pkg-config file
get the icu version if you can


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	10 Jul 2003 10:30:14 -0000	1.33
+++ Makefile.am	11 Jul 2003 17:33:19 -0000	1.34
@@ -79,7 +79,13 @@
 SUBDIRS += $(TESTSDIR) $(UTILSDIR) $(EXAMPLESDIR)
 
 INCLUDES = -I $(top_srcdir)/include
-EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh
+EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh sword.pc.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = sword.pc
+
+$(pkgconfig_DATA): config.status
+
 
 if INSTCONF
 sysconf_DATA = sword.conf
@@ -103,6 +109,8 @@
 
 include locales.d/Makefile.am
 include samples/Makefile.am
+include debian/Makefile.am
+include doc/Makefile.am
 
 restore:
 	cd $(top_srcdir) && ./scripts/restoremake.sh

Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.ac	9 Jul 2003 22:10:05 -0000	1.24
+++ configure.ac	11 Jul 2003 17:33:19 -0000	1.25
@@ -52,15 +52,38 @@
 	AC_CHECK_LIB(z, compress)
 fi
 
+# ---------------------------------------------------------------------
+# Find pkg-config
+# ---------------------------------------------------------------------
+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/])
+fi
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
+  :
+else
+  AC_MSG_ERROR([*** pkg-config too old; version 0.14 or better required.])
+fi
+
 
 # ---------------------------------------------------------------------
 # Find ICU tools
 # ---------------------------------------------------------------------
+ICU_VER=
 if test x$with_icu = xyes; then
 	AC_PATH_PROG([PKGDATA], [pkgdata],[/usr/sbin/pkgdata],[$PATH:/usr/sbin:.])
 	AC_PATH_PROG([GENCCODE], [genccode], [/usr/sbin/genccode], [$PATH:/usr/sbin:.])
 	AC_PATH_PROG([GENCMN], [gencmn], [/usr/sbin/gencmn], [$PATH:/usr/sbin:.])
 	AC_PATH_PROG([GENRB], [genrb], [/usr/sbin/genrb], [$PATH:/usr/sbin:.])
+	
+	AC_PATH_PROG(ICU_CONFIG, icu-config, no)
+	if test "$ICU_CONFIG" = "no" ; then
+	   echo "*** The icu-config script installed by icu could not be found"
+	   echo "*** continuing anyway"
+	else
+	   ICU_VER=`$ICU_CONFIG --version`
+	fi
 fi
 
 # ---------------------------------------------------------------------
@@ -180,6 +203,7 @@
 AC_SUBST(CC)
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
+AC_SUBST(ICU_VER)
 AC_SUBST(enable_debug)
 AC_SUBST(enable_profile)
 
@@ -213,5 +237,6 @@
 # ---------------------------------------------------------------------
 AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile utilities/Makefile examples/Makefile \
 	examples/cmdline/Makefile apps/Makefile apps/console/Makefile \
-	apps/console/diatheke/Makefile icu/Makefile)
+	apps/console/diatheke/Makefile icu/Makefile sword.pc)
 AC_OUTPUT
+