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