X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=configure;h=8d2f10e8b81be744c4baf7e1cb32ba779666ad6b;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=b6486268f0a810068785b0e070e40045eec244df;hpb=785a9044526226179fdf6cf1e843147fb64aad8d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/configure b/configure
index b6486268..8d2f10e8 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,7 @@ CC="gcc"
 CXX="g++"
 CCFLAGS="$CCFLAGS -Wall -g"
 OPTIM="$OPTIM -O3 -funroll-loops"
-LINKLIBS="-lz"
+LINKLIBS="-lz -lbz2"
 MAKE=make
 
 # System-specific flags
@@ -49,7 +49,7 @@ case $SYSTEM in
 
   Linux)
     DEFINES="$DEFINES SYS_LINUX USE_PTHREAD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64"
-    LINKLIBS="$LINKLIBS -lpthread"
+    LINKLIBS="$LINKLIBS -lpthread -ldl"
     ;;
 
   CYGWIN*)
@@ -97,19 +97,25 @@ else
 MAKE=make
 fi
 
-# If the user included the --snapshot argument, mark it down.
-if [[ $1 = "--snapshot" ]]
-then
+# Unless the user wants a release build, configure for SVN snapshots
+if test "$1" = "--release" || test "$2" = "--release"; then
+    SNAPSHOT=0
+else
     SNAPSHOT=1
+fi
+
+# We fought the law and the law won
+if test "$1" = "--libdvdcss" || test "$2" = "--libdvdcss"; then
+    CSS=1
 else
-    SNAPSHOT=0
+    CSS=0
 fi
 
 # Generating the HB_BUILD and HB_VERSION for snapshots requires
 # the build date, working path, and current SVN revision. 
-BUILD_DATE=$(date +%Y%m%d)
-FULL_PATH=$(pwd)
-SVN_REV=$(svnversion)
+BUILD_DATE=`date +%Y%m%d`
+FULL_PATH=`pwd`
+SVN_REV=`svnversion`
 
 # Generate config.jam
 rm -f config.jam
@@ -127,6 +133,7 @@ SNAPSHOT = $SNAPSHOT ;
 BUILD_DATE = $BUILD_DATE ;
 FULL_PATH = $FULL_PATH ;
 SVN_REV = $SVN_REV ;
+CSS      = $CSS ;
 EOF
 
 echo