--- pkgconfig-0.14.0/configure.in 2002-10-10 17:17:08.000000000 -0400 +++ pkgconfig-0.14.0/configure.in 2003-02-10 21:47:52.000000000 -0500 @@ -20,6 +20,11 @@ AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$native_win32 = xyes) +case "$libdir" in +*lib64) AC_DEFINE(PREFER_LIB64,1,[Define if your native architecture defines libdir to be $prefix/lib64 instead of $prefix/lib.]) ;; +*) : ;; +esac + if test x$native_win32 = xyes; then # On Win32, use the normal installed GLib. Yes, this is a circular # dependency. But then, only experienced hackers that presumably can --- pkgconfig-0.14.0/pkg.c 2002-10-10 17:14:59.000000000 -0400 +++ pkgconfig-0.14.0/pkg.c 2003-02-10 21:42:24.000000000 -0500 @@ -842,25 +842,31 @@ g_slist_foreach (system_directories, (GFunc) g_free, NULL); g_slist_free (system_directories); +#ifdef PREFER_LIB64 + #define system_libs "/usr/lib64" +#else + #define system_libs "/usr/lib" +#endif count = 0; iter = pkg->L_libs; while (iter != NULL) { - if (strcmp (iter->data, "-L/usr/lib") == 0 || - strcmp (iter->data, "-L /usr/lib") == 0) + if (strcmp (iter->data, "-L" system_libs) == 0 || + strcmp (iter->data, "-L " system_libs) == 0) { - debug_spew ("Package %s has -L/usr/lib in Libs\n", + debug_spew ("Package %s has -L" system_libs " in Libs\n", pkg->name); if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL) { iter->data = NULL; ++count; - debug_spew ("Removing -L/usr/lib from libs for %s\n", pkg->key); + debug_spew ("Removing -L" system_libs " from libs for %s\n", pkg->key); } } iter = iter->next; } +#undef system_libs while (count) {