From 20d118d57a9c52bc2d933630d4f833f284593293 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:07:18 +0000 Subject: 2005-05-21 Tollef Fog Heen Author: tfheen Date: 2005-05-21 09:14:47 GMT 2005-05-21 Tollef Fog Heen * 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. --- pkg.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkg.h') diff --git a/pkg.h b/pkg.h index b5f73df..774d896 100644 --- a/pkg.h +++ b/pkg.h @@ -72,16 +72,18 @@ struct _Package GSList *conflicts; /* list of RequiredVersion */ gboolean uninstalled; /* used the -uninstalled file */ int path_position; /* used to order packages by position in path of their .pc file, lower number means earlier in path */ + int libs_num; /* Number of times the "Libs" header has been seen */ + int libs_private_num; /* Number of times the "Libs.private" header has been seen */ }; Package *get_package (const char *name); -char * package_get_l_libs (Package *pkg, gboolean recurse); -char * packages_get_l_libs (GSList *pkgs, gboolean recurse); -char * package_get_L_libs (Package *pkg, gboolean recurse); -char * packages_get_L_libs (GSList *pkgs, gboolean recurse); +char * package_get_l_libs (Package *pkg); +char * packages_get_l_libs (GSList *pkgs); +char * package_get_L_libs (Package *pkg); +char * packages_get_L_libs (GSList *pkgs); char * package_get_other_libs (Package *pkg); char * packages_get_other_libs (GSList *pkgs); -char * packages_get_all_libs (GSList *pkgs, gboolean recurse); +char * packages_get_all_libs (GSList *pkgs); char * package_get_I_cflags (Package *pkg); char * packages_get_I_cflags (GSList *pkgs); char * package_get_other_cflags (Package *pkg); -- cgit v1.2.1