[pktools] 208/375: fine tuning on distro

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit 0d6b6eabeb97729859d7dfd9da3c20582cbfda84
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Thu Mar 27 19:10:21 2014 +0100

    fine tuning on distro
---
 Makefile.am  | 24 ++++++++++++++++++++++++
 configure.ac | 25 ++++++++++++++-----------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index afa0ec6..81d7d64 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,27 @@ SUBDIRS = src/base \
 	src/fileclasses \
 	$(LASCLASSES_OPT) \
 	src/apps
+
+## The generated configuration header is installed in its own subdirectory of
+## $(libdir).  The reason for this is that the configuration information put
+## into this header file describes the target platform the installed library
+## has been built for.  Thus the file must not be installed into a location
+## intended for architecture-independent files, as defined by the Filesystem
+## Hierarchy Standard (FHS).
+## The nodist_ prefix instructs Automake to not generate rules for including
+## the listed files in the distribution on 'make dist'.  Files that are listed
+## in _HEADERS variables are normally included in the distribution, but the
+## configuration header file is generated at configure time and should not be
+## shipped with the source tarball.
+pktools_libincludedir = $(libdir)/pktools/include
+nodist_pktools_libinclude_HEADERS = config.h
+
+
+## Install the generated pkg-config file (.pc) into the expected location for
+## architecture-dependent package configuration information.  Occasionally,
+## pkg-config files are also used for architecture-independent data packages,
+## in which case the correct install location would be $(datadir)/pkgconfig.
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = pktools.pc
+
+#bin_SCRIPTS = pktools-config
diff --git a/configure.ac b/configure.ac
index fae3f47..2c95185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,11 +8,11 @@ GDAL_FOUND="no"
 if test ! -z "$GDAL_CFLAGS" -a ! -z "$GDAL_LDFLAGS"; then
 GDAL_FOUND="yes"
 fi
-AC_MSG_WARN([$GDAL_VERSION])
-AC_MSG_WARN([$GDAL_CFLAGS])
-AC_MSG_WARN([$GDAL_LDFLAGS])
-AC_MSG_WARN([$GDAL_DEP_LDFLAGS])
-AC_MSG_WARN([$GDAL_OGR_ENABLED])
+dnl AC_MSG_WARN([$GDAL_VERSION])
+dnl AC_MSG_WARN([$GDAL_CFLAGS])
+dnl AC_MSG_WARN([$GDAL_LDFLAGS])
+dnl AC_MSG_WARN([$GDAL_DEP_LDFLAGS])
+dnl AC_MSG_WARN([$GDAL_OGR_ENABLED])
 
 # check for C++ compiler and the library compiler
 AC_PROG_CXX
@@ -32,10 +32,10 @@ AS_HELP_STRING([--enable-fann], [Enable feature fann]))
 AS_IF([test "x$enable_fann" = "xyes"], [
 PKG_CHECK_MODULES(FANN, fann >= 2.1.0, [HAVE_FANN=1], [HAVE_FANN=0])
 AM_CONDITIONAL([USE_FANN], [test "$HAVE_FANN" -eq 1])
-AC_MSG_WARN("USE_FANN=true")
+dnl AC_MSG_WARN("USE_FANN=true")
 ], [
 AM_CONDITIONAL(USE_FANN, false)
-AC_MSG_WARN("USE_FANN=false")
+dnl AC_MSG_WARN("USE_FANN=false")
 ])
 
 dnl AC_ARG_ENABLE([svm],
@@ -51,12 +51,12 @@ AS_HELP_STRING([--enable-las], [Enable feature las]))
 
 AS_IF([test "x$enable_las" = "xyes"], [
 AM_CONDITIONAL(USE_LAS, true)
-AC_MSG_WARN("USE_LAS=true")
+dnl AC_MSG_WARN("USE_LAS=true")
 LASCLASSES_OPT="src/lasclasses"
 AC_SUBST([LASCLASSES_OPT])
 ], [
 AM_CONDITIONAL(USE_LAS, false)
-AC_MSG_WARN("USE_LAS=false")
+dnl AC_MSG_WARN("USE_LAS=false")
 ])
 
 AC_ARG_ENABLE([nlopt],
@@ -65,10 +65,10 @@ AS_HELP_STRING([--enable-nlopt], [Enable feature nlopt]))
 AS_IF([test "x$enable_nlopt" = "xyes"], [
 PKG_CHECK_MODULES(NLOPT, nlopt >= 2.1.0, [HAVE_NLOPT=1], [HAVE_NLOPT=0])
 AM_CONDITIONAL([USE_NLOPT], [test "$HAVE_NLOPT" -eq 1])
-AC_MSG_WARN("USE_NLOPT=true")
+dnl AC_MSG_WARN("USE_NLOPT=true")
 ], [
 AM_CONDITIONAL(USE_NLOPT, false)
-AC_MSG_WARN("USE_NLOPT=false")
+dnl AC_MSG_WARN("USE_NLOPT=false")
 ])
 
 
@@ -100,6 +100,8 @@ AC_SUBST([PKTOOLS_SO_VERSION], [1:0:0])
 
 # files to generate via autotools (.am or .in source files)
 AC_CONFIG_HEADERS([config.h])
+#frankie says: "You should not distribute the config.h file, but the config.h.in file only".
+#AC_CONFIG_HEADERS([config.h])
 
 AM_COND_IF([USE_LAS],
 	[AC_CONFIG_FILES([
@@ -111,6 +113,7 @@ AC_CONFIG_FILES([
 	src/imageclasses/Makefile
 	src/fileclasses/Makefile
 	src/apps/Makefile
+	pktools.pc:pktools.pc.in
 	])
 # generate the final Makefile etc.
 AC_OUTPUT

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git