Changeset 32017 in vbox for trunk

Timestamp:

Aug 26, 2010 7:25:26 PM (14 years ago)

Author:

vboxsync

Message:

configure: Fix png check for FreeBSD, fixes building DisplayPNGUtil.cpp if the system libpng is installed

File:

• trunk/configure (modified) (3 diffs)

trunk/configure

@@ -124 +124 @@
 INCZ=""
 LIBZ="-lz"
-INCPNG=""
-LIBPNG="-lpng"
 CXX_FLAGS=""
 if [ "$OS" = "freebsd" ]; then
@@ -132 +130 @@
   INCPULSE="-I/usr/local/include"
   LIBPULSE="-L/usr/local/lib"
+  INCPNG="-I/usr/local/include"
+  LIBPNG="-L/usr/local/lib -lpng"
 else
   INCCURL=""
   LIBCURL="-lcurl"
+  INCPNG=""
+  LIBPNG="-lpng"
 fi
 PKGCONFIG="`which_wrapper pkg-config`"
@@ -2459 +2461 @@
 check_curl
 [ "$OS" != "darwin"  ] && check_z
-[ "$OS" != "darwin" -a "$OS" != "freebsd" ] && check_png
+[ "$OS" != "darwin"  ] && check_png
 [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
 [ $WITH_SDL -eq 1 ]    && check_sdl