2005-05-21 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-05-21 09:14:47 GMT
2005-05-21  Tollef Fog Heen  <tfheen@err.no>

    * check/check-libs-private: New test to check for support for
    private libraries.

    * check/simple.pc (prefix): Add Libs.private header.

    * check/Makefile.am (TESTS): Add check-libs-private test

    * pkg.h: Adjust function prototypes.

    * pkg.c: Add global ignore_private_libs variable.
    (scan_dir): Use the correct free function.  Stop leaking file
    descriptors.
    (package_get_l_libs, packages_get_l_libs, package_get_L_libs,
    packages_get_L_libs): Stop the recursive silliness and go back to
    old behaviour.
    (packages_get_all_libs): Adjust parameters to packages_get_*_libs
    (enable_private_libs, disable_private_libs): Trivial helper
    functions.

    * pkg-config.1: Update documentation wrt search path (Debian
    #308942), update docs for Libs.private and add the problematic
    handling of mixing = and non-= arguments to the bugs section.

    * parse.h: Adjust parameters for parse_package_file to get private
    libs or not.

    * parse.c (trim_and_sub): Fix memory leak.
    (_do_parse_libs): New function including what's common between
    parse_libs and parse_private_libs.
    (parse_libs_private): New function.  Handle private libraries.
    (parse_line): Add . to the list of valid characters in headers (so
    Libs.private works correctly.
    (parse_line): Fix memory leaks.
    (parse_line): Handle Libs.private.
    (parse_package_file): Fix memory leak.

    * main.c (main): Fix memory leak.

    * NEWS: Document changes to inter-library handling.

    * main.c (main): Handle inter-library dependencies old-style, but
    do private libraries too.  Adjust parameters to
    packages_get_*_libs.

    * configure.in: Change comment wrt inter-library handling to talk
    about private libraries instead.

1 files changed, 22 insertions, 7 deletions

diff --git a/pkg-config.1 b/pkg-config.1
index 5bbb57c..35be16e 100644
--- a/pkg-config.1
+++ b/pkg-config.1
@@ -210,15 +210,23 @@ from automatically trying to override the value of the variable
 Also this option is available only on Windows. It sets the name of the
 variable that \fIpkg-config\fP automatically sets as described above.
 
+.TP
+.I "--static"
+Output libraries suitable for static linking.  That means including
+any private libraries in the output.  This relies on proper tagging in
+the .pc files, else a too large number of libraries will ordinarily be
+output.
+
 .SH ENVIRONMENT VARIABLES
 
 .TP
 .I "PKG_CONFIG_PATH"
-A colon-separated (on Windows, semicolon-separated)
-list of directories to search for .pc files.
-The default directory will always be searched after searching the
-path; the default is \fIlibdir\fP/pkgconfig where \fIlibdir\fP
-is the libdir where \fIpkg-config\fP was installed.
+A colon-separated (on Windows, semicolon-separated) list of
+directories to search for .pc files.  The default directory will
+always be searched after searching the path; the default is
+\fIlibdir\fP/pkgconfig:\fIdatadir\fP/pkgconfig where \fIlibdir\fP is
+the libdir where \fIpkg-config\fP and \fIdatadir\fP is the datadir
+where \fIpkg-config\fP was installed.
 
 .TP
 .I "PKG_CONFIG_DEBUG_SPEW"
@@ -318,6 +326,7 @@ URL: http://www.gtk.org
 Requires: glib-2.0 = 1.3.1
 Conflicts: foobar <= 4.5
 Libs: -L${libdir} -lgobject-1.3
+Libs.private: -lm
 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib/include 
 .fi
 
@@ -381,6 +390,12 @@ Don't add any flags for required packages; \fIpkg-config\fP will
 add those automatically.
 
 .TP
+.I "Libs.private:"
+This line should list any private libraries in use.  Private libraries
+are libraries which are not exposed through your library, but are
+needed in the case of static linking.
+
+.TP
 .I "Cflags:"
 This line should list the compile flags specific to your package. 
 Don't add any flags for required packages; \fIpkg-config\fP will 
@@ -396,6 +411,6 @@ various hackers in the GNOME team.  It was inspired by Owen Taylor's
 \fIgtk-config\fP program.
 
 .SH BUGS
-Hah!
-
 
+\fIpkg-config\fP does not handle mixing of parameters with and without
+= well.  Stick with one.