[x264-devel] Support more recent GPAC versions

[Yasuhiro Ikeda]

x264 | branch: master | Yasuhiro Ikeda <wipple625 at gmail.com> | Sun Apr 24 15:33:45 2011 +0900| [e41a777626c95c97e14451c221688447187fa48b] | committer: Jason Garrett-Glaser

Support more recent GPAC versions

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=e41a777626c95c97e14451c221688447187fa48b
---

 configure |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 29b6e85..ca4f449 100755
--- 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"