]> git.sesse.net Git - x264/commitdiff
Support more recent GPAC versions
authorYasuhiro Ikeda <wipple625@gmail.com>
Sun, 24 Apr 2011 06:33:45 +0000 (15:33 +0900)
committerFiona Glaser <fiona@x264.com>
Tue, 26 Apr 2011 05:45:05 +0000 (22:45 -0700)
configure

index 29b6e854d531341676fc7b58c434467634e3c42f..ca4f44953a83911400416b8ea6573386fc90014f 100755 (executable)
--- a/configure
+++ b/configure
@@ -780,12 +780,12 @@ if [ "$swscale" = "yes" ]; then
     fi
 fi
 
-GPAC_LIBS="-lgpac_static"
-if [ $SYS = WINDOWS ]; then
-    GPAC_LIBS="$GPAC_LIBS -lwinmm"
-fi
 if [ "$gpac" = "auto" ] ; then
     gpac="no"
+    cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static"
+    if [ "$SYS" = "WINDOWS" ] ; then
+        GPAC_LIBS="$GPAC_LIBS -lwinmm"
+    fi
     if cc_check gpac/isomedia.h "$GPAC_LIBS" ; then
         if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then
             gpac="yes"