From 466ffadb12c5488e65ccf95170c41cd224b2ca8f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 1 May 2012 16:25:03 -0600 Subject: [PATCH] racket/draw: use libpng15.so.15 when available E.g., Mageia 2 has libpng15, not libpng12 --- collects/racket/draw/unsafe/png.rkt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt index 54bf3bf58c..9507c310f3 100644 --- a/collects/racket/draw/unsafe/png.rkt +++ b/collects/racket/draw/unsafe/png.rkt @@ -10,9 +10,11 @@ [(unix) ;; Most Linux distros supply "libpng12", while other Unix ;; variants often have just "libpng": - (with-handlers ([exn:fail:filesystem? - (lambda (exn) (ffi-lib "libpng"))]) - (ffi-lib "libpng12" '("0" "")))] + (ffi-lib "libpng12" '("0" "") + #:fail (lambda () + (ffi-lib "libpng15" '("15" "") + #:fail (lambda () + (ffi-lib "libpng")))))] [(macosx) (ffi-lib "libpng15.15.dylib")] [(windows) (ffi-lib "zlib1.dll")