check to see if we need -L/usr/X11R6/lib like some systems do (Darwin for example...

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index cf60e77659f5755d250d0c1f41389257bc217c9c..d940143c741b6c5728eff416926795f94f61928a 100644 (file)
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -7,13 +7,13 @@ MD5 b33546756e2b39fcd72b66afda68d1a2 ChangeLog 1301
 MD5 eb209f87460fb61c12f96550740045e8 files/urt-3.1b-tempfile.patch 593
 MD5 17ad983b2b258ee3e633108e342276c1 files/urt-3.1b-rle-fixes.patch 5072
 MD5 3f2cd2217e501f325bdc547781337c5c files/urt-3.1b-compile-updates.patch 3397
-MD5 5cf67043e6b90e68277ec2c02066556f files/gentoo-config 670
+MD5 8084f697c1e179ccb48ec8f1e6d1d564 files/gentoo-config 949
 MD5 95677aac597cb74671547777ca82e9e5 files/urt-3.1b-build-fixes.patch 350
 MD5 6f003bc3da29163d55742e87559a3a87 files/digest-urt-3.1b-r1 60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQc7TgIKl8Uu19MoRAit5AJ4oIjv2LoeKMV4B+ZxXfYlHQHlddQCeP+9p
-zZBlVMy70hUechUgQCVixc0=
-=QNg2
+iD8DBQFDRINqgIKl8Uu19MoRAlaKAJ40fmGvPIDab7mYgV4Oq7uBNEmpvQCeIhI2
+mje7Myj0eMQGn8A6Mk7am/c=
+=3dtD
 -----END PGP SIGNATURE-----

diff --git a/media-libs/urt/files/gentoo-config b/media-libs/urt/files/gentoo-config
index 1680f11fcc25b9376df6a85b0a54017028da2648..a2d9ec3faf2f366d94a9af93fd7692b17c965832 100644 (file)
--- a/media-libs/urt/files/gentoo-config
+++ b/media-libs/urt/files/gentoo-config
@@ -41,3 +41,12 @@ INCTIFF =
 LIBTIFF = -ltiff
 INCX11 =
 LIBX11 = -lX11
+
+# Most people have migrated X11 to /usr/lib, but just in case ...
+check_x11=$(shell \
+       echo 'int main(){}' > test.c ; \
+       if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \
+               echo "-L/usr/X11R6/lib" ; \
+       fi ; \
+       rm -f .urt-x11-test test.c)
+LIBX11 += $(call check_x11)