[cpp-log4shib] 04/17: Don't overwrite log4shib.pc.in
Scott Cantor
cantor.2 at osu.edu
Mon Jun 25 10:18:15 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=b0ab8a2dd2aec8eb5cafc9d79e72639e5ca75a65
commit b0ab8a2dd2aec8eb5cafc9d79e72639e5ca75a65
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Sun Jun 24 14:57:05 2018 +0200
Don't overwrite log4shib.pc.in
If log4shib.pc.in is removed from the repo, automake misses it.
Also, AC_CONFIG_PKGCONFIG_IN does not support the private fields,
so eliminate it reducing the complexity instead.
---
configure.ac | 6 --
log4shib.pc.in | 5 +-
m4/ac_config_pkgconfig_in.m4 | 133 -------------------------------------------
3 files changed, 3 insertions(+), 141 deletions(-)
diff --git a/configure.ac b/configure.ac
index 98958d3..9ae4a58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,17 +140,11 @@ BB_ENABLE_DOXYGEN
#BB_CHECK_OMNITHREADS
#BB_CHECK_PTHREADS
-LOG4SHIB_LIBS="-llog4shib"
-LOG4SHIB_LIBDEPS="$LIBS"
-LOG4SHIB_VERSION="$VERSION"
-
PETI_PEDANTIC_GCC
# Create files
# ----------------------------------------------------------------------------
-AC_CONFIG_PKGCONFIG_IN([log4shib], [C++ library for flexible logging, modeled after Log4j])
-
AC_CONFIG_FILES([
Makefile
log4shib.spec
diff --git a/log4shib.pc.in b/log4shib.pc.in
index fb91e2d..768e6e3 100644
--- a/log4shib.pc.in
+++ b/log4shib.pc.in
@@ -6,5 +6,6 @@ includedir=@includedir@
Name: @PACKAGE@
Description: C++ library for flexible logging, modeled after Log4j
Version: @VERSION@
-Libs: -L${libdir} @log4shib_libs@
-Cflags: -I${includedir}
+Libs: -L${libdir} -llog4shib
+Libs.private: @PTHREAD_LIBS@
+Cflags: -I${includedir} @PTHREAD_CFLAGS@
diff --git a/m4/ac_config_pkgconfig_in.m4 b/m4/ac_config_pkgconfig_in.m4
deleted file mode 100644
index 20ca396..0000000
--- a/m4/ac_config_pkgconfig_in.m4
+++ /dev/null
@@ -1,133 +0,0 @@
-dnl @synopsis AC_CONFIG_PKGCONFIG_IN [(LIBRARY [, DESCRIPTION [, DESTINATION]])]
-dnl
-dnl Creates a custom pkg-config script. The script supports
-dnl --cflags, --libs and --version options.
-dnl
-dnl This macro saves you all the typing for a pkg-config.in script;
-dnl you don't even need to distribute one along. Place this macro
-dnl in your configure.ac, et voila, you got one that you want to install.
-dnl
-dnl The options:
-dnl
-dnl $1 = LIBRARY e.g. gtk, ncurses
-dnl $2 = DESCRIPTION one line description of library
-dnl $3 = DESTINATION directory path, e.g. src/scripts
-dnl
-dnl It is suggested that the following CFLAGS and LIBS variables are
-dnl used in your configure.ac. library_libs is *essential*.
-dnl library_cflags is important, but not always needed. If they do not
-dnl exist, defaults will be taken from LIBRARY_CFLAGS, LIBRARY_LIBS
-dnl (should be -llibrary *only*) and LIBRARY_LIBDEPS (-l options for
-dnl libraries your library depends upon.
-dnl LIBLIBRARY_LIBS is simply $LIBRARY_LIBS $LIBRARY_LIBDEPS.
-dnl NB. LIBRARY and library are the name of your library, in upper and
-dnl lower case repectively e.g. GTK, gtk.
-dnl
-dnl LIBRARY_CFLAGS: cflags for compiling libraries and example progs
-dnl LIBRARY_LIBS: libraries for linking programs
-dnl LIBRARY_LIBDEPS*: libraries for linking libraries against (needed
-dnl to link -static
-dnl LIBRARY_REQUIRES: packages required by your library
-dnl LIBRARY_CONFLICTS: packages to conflict with your library
-dnl library_cflags*: cflags to store in library-config
-dnl library_libs*: libs to store in library-config
-dnl LIBLIBRARY_LIBS: libs to link programs IN THIS PACKAGE ONLY against
-dnl LIBRARY_VERSION*: the version of your library (x.y.z recommended)
-dnl *=required if you want sensible output, otherwise they will be
-dnl *guessed* (DWIM, but usually correct)
-dnl
-dnl There is also an AC_SUBST(LIBRARY_PKGCONFIG) that will be set to
-dnl the name of the file that we output in this macro. Use as:
-dnl
-dnl install-data-local: install-pkgconfig
-dnl install-pkgconfig:
-dnl $(mkinstalldirs) $(DESTDIR)$(bindir)
-dnl $(INSTALL_DATA) @LIBRARY_PKGCONFIG@ $(DESTDIR)$(prefix)/lib/pkgconfig
-dnl
-dnl Or, if using automake:
-dnl
-dnl pkgconfigdatadir = $(prefix)/lib/pkgconfig
-dnl pkgconfigdata_DATA = gimpprint.pc = @LIBRARY_PKGCONFIG@
-dnl
-dnl Example usage:
-dnl
-dnl GIMPPPRINT_LIBS="-lgimpprint"
-dnl AC_CHECK_LIB(m,pow,
-dnl GIMPPRINT_DEPLIBS="${GIMPPRINT_DEPLIBS} -lm")
-dnl AC_CONFIG_PKGCONFIG_IN([gimpprint], [GIMP Print Top Quality Printer Drivers], [src/main])
-dnl
-dnl @version $Id: ac_config_pkgconfig_in.m4,v 1.1 2004/01/27 10:27:38 bastiaan Exp $
-dnl @author Roger Leigh <roger at whinlatter.uklinux.net>
-dnl
-## AC_CONFIG_PKGCONFIG_IN(LIBRARY, DESCRIPTION, DESTINATION)
-## ---------------------------------------------------------
-## Create a custom pkg-config script for LIBRARY. Include a one-line
-## DESCRIPTION. The script will be created in a DESTINATION
-## directory.
-AC_DEFUN([AC_CONFIG_PKGCONFIG_IN],
-[# create a custom pkg-config file ($1.pc.in)
-m4_pushdef([PKGCONFIG_DIR], [m4_if([$3], , , [$3/])])
-PKGCONFIG_FILE="PKGCONFIG_DIR[]$1.pc.in"
-AC_SUBST(target)dnl
-AC_SUBST(host)dnl
-AC_SUBST(build)dnl
-dnl create directory if it does not preexist
-m4_if([$3], , , [AS_MKDIR_P([$3])])
-AC_MSG_NOTICE([creating $PKGCONFIG_FILE])
-dnl we're going to need uppercase, lowercase and user-friendly versions of the
-dnl string `MODULE'
-m4_pushdef([MODULE_UP], m4_translit([$1], [a-z], [A-Z]))dnl
-m4_pushdef([MODULE_DOWN], m4_translit([$1], [A-Z], [a-z]))dnl
-if test -z "$MODULE_DOWN[]_cflags" ; then
- if test -n "$MODULE_UP[]_CFLAGS" ; then
- MODULE_DOWN[]_cflags="$MODULE_UP[]_CFLAGS"
- else
-dnl AC_MSG_WARN([variable `MODULE_DOWN[]_cflags' undefined])
- MODULE_DOWN[]_cflags=''
- fi
-fi
-AC_SUBST(MODULE_DOWN[]_cflags)dnl
-if test -z "$MODULE_DOWN[]_libs" ; then
- if test -n "$MODULE_UP[]_LIBS" ; then
- MODULE_DOWN[]_libs="$MODULE_UP[]_LIBS"
- else
- AC_MSG_WARN([variable `MODULE_DOWN[]_libs' and `MODULE_UP[]_LIBS' undefined])
- MODULE_DOWN[]_libs='-l$1'
- fi
- if test -n "$MODULE_UP[]_LIBDEPS" ; then
- MODULE_DOWN[]_libs="$MODULE_DOWN[]_libs $MODULE_UP[]_LIBDEPS"
- fi
-fi
-AC_SUBST(MODULE_DOWN[]_libs)dnl
-AC_SUBST(MODULE_UP[]_REQUIRES)
-AC_SUBST(MODULE_UP[]_CONFLICTS)
-if test -z "$MODULE_UP[]_VERSION" ; then
- AC_MSG_WARN([variable `MODULE_UP[]_VERSION' undefined])
- MODULE_UP[]_VERSION="$VERSION"
-fi
-AC_SUBST(MODULE_UP[]_VERSION)dnl
-echo 'prefix=@prefix@' >$PKGCONFIG_FILE
-echo 'exec_prefix=@exec_prefix@' >>$PKGCONFIG_FILE
-echo 'libdir=@libdir@' >>$PKGCONFIG_FILE
-echo 'includedir=@includedir@' >>$PKGCONFIG_FILE
-echo '' >>$PKGCONFIG_FILE
-echo 'Name: @PACKAGE@' >>$PKGCONFIG_FILE
-echo 'Description: $2' >>$PKGCONFIG_FILE
-if test -n "$MODULE_UP[]_REQUIRES" ; then
- echo 'Requires: @MODULE_UP[]_REQUIRES@' >>$PKGCONFIG_FILE
-fi
-if test -n "$MODULE_UP[]_CONFLICTS" ; then
- echo 'Conflicts: @MODULE_UP[]_CONFLICTS@' >>$PKGCONFIG_FILE
-fi
-echo 'Version: @VERSION@' >>$PKGCONFIG_FILE
-echo 'Libs: -L${libdir} @MODULE_DOWN[]_libs@' >>$PKGCONFIG_FILE
-echo 'Cflags: -I${includedir} @MODULE_DOWN[]_cflags@' >>$PKGCONFIG_FILE
-m4_pushdef([PKGCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl
-PKGCONFIG_UP[]_PKGCONFIG="PKGCONFIG_DIR[]$1-config"
-AC_SUBST(PKGCONFIG_UP[]_PKGCONFIG)
-dnl AC_CONFIG_FILES(PKGCONFIG_DIR[]$1[-config], [chmod +x ]PKGCONFIG_DIR[]$1[-config])
-m4_popdef([PKGCONFIG_UP])
-m4_popdef([MODULE_DOWN])dnl
-m4_popdef([MODULE_UP])dnl
-m4_popdef([PKGCONFIG_DIR])dnl
-])
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list