X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=configure;h=224b2b28db6b7915d267b7e8272c6380db114d07;hb=b5238b145c9d17f62454c015c1950e63f888fd01;hp=7c02be72e2e02e4860524869bf341f442251ecfd;hpb=57606cb58dd2c3fb5efd0623251503c6bec12f06;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/configure b/configure
index 7c02be72..224b2b28 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*)
@@ -65,6 +65,7 @@ case $SYSTEM in
     echo "Unsupported operating system"
     exit 1 ;;
 esac
+echo
 echo "System: $SYSTEM"
 
 # Check for endianness (we need to define WORDS_BIGENDIAN for libdvdread)
@@ -97,17 +98,15 @@ else
 MAKE=make
 fi
 
-# If the user included the --snapshot argument, mark it down.
-if [[ $1 = "--snapshot" ]] || [[ $2 = "--snapshot" ]]
-then
-    SNAPSHOT=1
-else
+# 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 [[ $1 = "--libdvdcss" ]] || [[ $2 = "--libdvdcss" ]] 
-then
+if test "$1" = "--libdvdcss" || test "$2" = "--libdvdcss"; then
     CSS=1
 else
     CSS=0
@@ -115,9 +114,9 @@ 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
@@ -139,6 +138,14 @@ CSS      = $CSS ;
 EOF
 
 echo
-echo "To build HandBrake, run:"
-echo " './jam' on a Mac (or 'make' to try the UB build method),"
-echo " 'jam' on Linux or Windows."
+echo "Don't run configure by hand, make runs it automatically."
+echo
+echo "No, really. That's it. Just type 'make' and hit return."
+echo
+echo "You're supposed to be building with make, not jam."
+echo "If you were going to use jam--which you shouldn't--you'd run:"
+echo " './jam' on a Mac, or"
+echo " 'jam' on Linux or Windows"
+echo
+echo "To make jam, boil fruit with sugar and an acid until pectins are released."
+echo