Repository: trafficserver Updated Branches: refs/heads/master 4beccb0e3 -> 326bf1059
TS-3351: add basic pkg-config support Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/326bf105 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/326bf105 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/326bf105 Branch: refs/heads/master Commit: 326bf1059594163dee18a7f03635d47eed073e87 Parents: 4beccb0 Author: James Peach <[email protected]> Authored: Mon Jan 12 10:01:53 2015 -0800 Committer: James Peach <[email protected]> Committed: Thu Jan 29 19:14:38 2015 -0800 ---------------------------------------------------------------------- .gitignore | 3 ++- CHANGES | 2 ++ configure.ac | 1 + tools/Makefile.am | 3 +++ tools/trafficserver.pc.in | 30 ++++++++++++++++++++++++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/326bf105/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 742636f..ba327f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.a *.so *.pyc -*.in +Makefile.in *~ *.tar.gz *.lo @@ -131,6 +131,7 @@ lib/tsconfig/test-tsconfig tools/http_load/http_load tools/jtest/jtest +tools/trafficserver.pc BUILDS DEBUG http://git-wip-us.apache.org/repos/asf/trafficserver/blob/326bf105/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 545ae80..7602c0a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.0 + *) [TS-3351] Add basic pkg-config support. + *) [TS-3349] Add DscpSet API's. *) [TS-3344] 401 responses invalidate cache entry even if http://git-wip-us.apache.org/repos/asf/trafficserver/blob/326bf105/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index c2e1c5c..e803e57 100644 --- a/configure.ac +++ b/configure.ac @@ -1911,6 +1911,7 @@ AC_CONFIG_FILES([ rc/trafficserver.service rc/trafficserver.xml tools/Makefile + tools/trafficserver.pc tools/tsxs ]) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/326bf105/tools/Makefile.am ---------------------------------------------------------------------- diff --git a/tools/Makefile.am b/tools/Makefile.am index c053068..fa0fe86 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,6 +19,9 @@ bin_SCRIPTS = tsxs tspush +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = trafficserver.pc + AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/326bf105/tools/trafficserver.pc.in ---------------------------------------------------------------------- diff --git a/tools/trafficserver.pc.in b/tools/trafficserver.pc.in new file mode 100644 index 0000000..38fdd8e --- /dev/null +++ b/tools/trafficserver.pc.in @@ -0,0 +1,30 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Name: trafficserver +Description: The @PACKAGE_NAME@ caching HTTP proxy server +URL: http://trafficserver.apache.org/ +Version: @PACKAGE_VERSION@ + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +# plugindir is the directory in which plugins should be installed. +plugindir=@libexecdir@ + +Cflags: -I${includedir}
