[Ehs-devel] SF.net SVN: ehs:[167] trunk

[<fe...@us...>]

Revision: 167
          http://sourceforge.net/p/ehs/code/167
Author:   felfert
Date:     2018-09-12 09:33:49 +0000 (Wed, 12 Sep 2018)
Log Message:
-----------
Add pkg-config support

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac

Added Paths:
-----------
    trunk/conf/ehs.pc.in

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2018-09-11 13:29:27 UTC (rev 166)
+++ trunk/Makefile.am	2018-09-12 09:33:49 UTC (rev 167)
@@ -25,9 +25,12 @@
 libehs_la_DEPENDENCIES = $(LIBEHS_RES)
 EXTRA_libehs_la_SOURCES = ehsrc.rc
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = conf/ehs.pc
+
 # Extra stuff to distribute in tarball 
 EXTRA_DIST = $(DX_CONFIG) ehs_development_guide.txt \
-			 ehs-stress.pl ehs-chunktest.pl conf/ehs.spec \
+			 ehs-stress.pl ehs-chunktest.pl conf/ehs.pc.in conf/ehs.spec \
 			 ChangeLog debian conf/authors.xml
 
 # We want the maintainer-clean to REALLY remove anything that can be

Added: trunk/conf/ehs.pc.in
===================================================================
--- trunk/conf/ehs.pc.in	                        (rev 0)
+++ trunk/conf/ehs.pc.in	2018-09-12 09:33:49 UTC (rev 167)
@@ -0,0 +1,14 @@
+# ehs pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ehs
+Description: ehs is an embedded HTTP server
+Version: @VERSION@
+Requires: openssl
+Conflicts:
+Libs: -L${libdir} -lehs
+Cflags: -I${includedir}

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2018-09-11 13:29:27 UTC (rev 166)
+++ trunk/configure.ac	2018-09-12 09:33:49 UTC (rev 167)
@@ -385,6 +385,6 @@
 DX_INIT_DOXYGEN([EHS], [conf/doxygen.cfg], [doc])
 
 AC_CONFIG_FILES([Makefile samples/Makefile setup/Makefile
-                 conf/doxygen.cfg doc/manual.dox conf/ehs.spec conf/mingw-ehs.spec
+                 conf/doxygen.cfg doc/manual.dox conf/ehs.spec conf/mingw-ehs.spec conf/ehs.pc
                  setup/findrequires.pl setup/isccwrap.sh ehsrc.rc ehstypes.h])
 AC_OUTPUT

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.