You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by bo...@apache.org on 2008/09/16 10:35:55 UTC
svn commit: r695767 - in /xerces/c/trunk: Makefile.am configure.ac
xerces-c.pc.in
Author: borisk
Date: Tue Sep 16 01:35:53 2008
New Revision: 695767
URL: http://svn.apache.org/viewvc?rev=695767&view=rev
Log:
Add support for generating pkgconfig file. Patch by Jay Berkenbilt (XERCESC-1824).
Added:
xerces/c/trunk/xerces-c.pc.in
Modified:
xerces/c/trunk/Makefile.am
xerces/c/trunk/configure.ac
Modified: xerces/c/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Makefile.am?rev=695767&r1=695766&r2=695767&view=diff
==============================================================================
--- xerces/c/trunk/Makefile.am (original)
+++ xerces/c/trunk/Makefile.am Tue Sep 16 01:35:53 2008
@@ -13,6 +13,9 @@
CLEANFILES = test-results.log
+pkgconfigdir = @pkgconfigdir@
+pkgconfig_DATA= xerces-c.pc
+
check:
-rm -f test-results.log
export PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export XERCESC_NLS_HOME=${abs_top_builddir}/src/.libs && cd ${top_srcdir} && perl scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/' 1> ${abs_top_builddir}/test-results.log
Modified: xerces/c/trunk/configure.ac
URL: http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=695767&r1=695766&r2=695767&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Tue Sep 16 01:35:53 2008
@@ -35,7 +35,8 @@
src/xercesc/util/MsgLoaders/ICU/resources/Makefile \
src/xercesc/util/MsgLoaders/MsgCatalog/Makefile \
tests/Makefile \
- samples/Makefile])
+ samples/Makefile \
+ xerces-c.pc])
# Check the target system
AC_CANONICAL_HOST
@@ -187,11 +188,21 @@
XERCES_MSGLOADER_SELECTION
XERCES_FILEMGR_SELECTION
+# Allow the user to specify the pkgconfig directory.
+#
+AC_ARG_WITH(pkgconfigdir,
+ AC_HELP_STRING([--with-pkgconfigdir=DIR],
+ [Specify location of pkgconfig dir (default is libdir/pkgconfig)]),
+ [pkgconfigdir=${withval}],
+ [pkgconfigdir='${libdir}/pkgconfig'])
+
+AC_SUBST([pkgconfigdir])
######################################################
-# Define some namespace-protected macros for use in the publicly visible
-# XercesConfig.h file.
+# Define some namespace-protected macros for use in the
+# publicly visible XercesConfig.h file.
######################################################
+
AC_DEFINE([XERCES_AUTOCONF], 1, [Define to true if autoconf is used in this configuration])
AS_IF([test x$ac_cv_header_sys_types_h = xyes],
Added: xerces/c/trunk/xerces-c.pc.in
URL: http://svn.apache.org/viewvc/xerces/c/trunk/xerces-c.pc.in?rev=695767&view=auto
==============================================================================
--- xerces/c/trunk/xerces-c.pc.in (added)
+++ xerces/c/trunk/xerces-c.pc.in Tue Sep 16 01:35:53 2008
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Xerces-C++
+Description: Validating XML parser library for C++
+Version: @VERSION@
+Libs: -L${libdir} -lxerces-c
+Cflags: -I${includedir}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org