2003-01-15 Havoc Pennington <hp@pobox.com>

Author: hp
Date: 2003-01-15 04:02:47 GMT
2003-01-15  Havoc Pennington  <hp@pobox.com>

	* pkg.c (package_init): honor a PKG_CONFIG_LIBDIR to move default
	search dir, useful in cross-compilation for example, bug
	#103545 fix from David Schleef
This commit is contained in:
Arch Librarian 2005-07-14 13:05:36 +00:00
parent 1a2fa277bd
commit bc990e9be1
3 changed files with 16 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2003-01-15 Havoc Pennington <hp@pobox.com>
* pkg.c (package_init): honor a PKG_CONFIG_LIBDIR to move default
search dir, useful in cross-compilation for example, bug
#103545 fix from David Schleef
2003-01-01 Zack Rusin <zack@kde.org>
* main.c (main): added --libs-only-other and --cflags-only-other

View file

@ -230,6 +230,10 @@ Don't strip -I/usr/include out of cflags.
.I "PKG_CONFIG_ALLOW_SYSTEM_LIBS"
Don't strip -L/usr/lib out of libs
.TP
.I "PKG_CONFIG_LIBDIR"
Replaces the default \fIpkg-config\fP search directory.
.SH WINDOWS SPECIALITIES
If a .pc file is found in a directory that matches the usual
conventions (i.e., ends with \\lib\\pkgconfig), the prefix for that

7
pkg.c
View file

@ -187,6 +187,11 @@ void
package_init ()
{
static gboolean initted = FALSE;
const char *pkglibdir;
pkglibdir = g_getenv ("PKG_CONFIG_LIBDIR");
if (pkglibdir == NULL)
pkglibdir = PKGLIBDIR;
if (!initted)
{
@ -197,7 +202,7 @@ package_init ()
path_positions = g_hash_table_new (g_str_hash, g_str_equal);
g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
scan_dir (PKGLIBDIR);
scan_dir (pkglibdir);
}
}