[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: xine-lib/src/xine-utils xine_check.c,1.44,1.45
From:       Darren Salt <dsalt () users ! sourceforge ! net>
Date:       2006-05-30 23:30:29
Message-ID: E1FlDfR-00071a-Ox () sc8-pr-cvs10 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/xine/xine-lib/src/xine-utils
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26365/src/xine-utils

Modified Files:
	xine_check.c 
Log Message:
Fix up health check to find libX11 and libXv shared objects even if devel
packages aren't installed (where appropriate). (Ubuntu 47357)


Index: xine_check.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xine_check.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xine_check.c	21 Apr 2006 23:15:45 -0000	1.44
+++ xine_check.c	30 May 2006 23:30:27 -0000	1.45
@@ -373,7 +373,7 @@
   /* Majority of thi code was taken from or inspired by the xvinfo.c file of XFree86 */
 
   dlerror(); /* clear error code */
-  x11_handle = dlopen("libX11.so", RTLD_LAZY);
+  x11_handle = dlopen(LIBX11_SO, RTLD_LAZY);
   if(!x11_handle) {
     hc->msg = dlerror();
     hc->status = XINE_HEALTH_CHECK_FAIL;
@@ -399,7 +399,7 @@
   }
   
   dlerror(); /* clear error code */
-  xv_handle = dlopen("libXv.so", RTLD_LAZY);
+  xv_handle = dlopen(LIBXV_SO, RTLD_LAZY);
   if(!xv_handle) {
     hc->msg = dlerror();
     /* Xv might still work when linked statically into the output plugin,



-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]