X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=configure;h=224b2b28db6b7915d267b7e8272c6380db114d07;hb=c8583487c4f72ebecc6da9ac737547f30b5430f1;hp=4f5fc2424b0909dea95758b787e07ed054350560;hpb=1445ca614d3db1677db99791469b8ced120a76ee;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/configure b/configure
index 4f5fc242..224b2b28 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,8 @@ CC="gcc"
 CXX="g++"
 CCFLAGS="$CCFLAGS -Wall -g"
 OPTIM="$OPTIM -O3 -funroll-loops"
-LINKLIBS="-lz"
+LINKLIBS="-lz -lbz2"
+MAKE=make
 
 # System-specific flags
 SYSTEM=`uname -s`
@@ -48,18 +49,23 @@ case $SYSTEM in
 
   Linux)
     DEFINES="$DEFINES SYS_LINUX USE_PTHREAD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64"
-    LINKLIBS="$LINKLIBS -lpthread"
+    LINKLIBS="$LINKLIBS -lpthread -ldl"
     ;;
 
   CYGWIN*)
     DEFINES="$DEFINES SYS_CYGWIN USE_PTHREAD"
     LINKLIBS="$LINKLIBS -lpthread"
     ;;
+  SunOS)
+    DEFINES="$DEFINES SYS_SunOS USE_PTHREAD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64"
+    LINKLIBS="$LINKLIBS -lpthread -lsocket -lnsl"
+    ;;
 
   *)
     echo "Unsupported operating system"
     exit 1 ;;
 esac
+echo
 echo "System: $SYSTEM"
 
 # Check for endianness (we need to define WORDS_BIGENDIAN for libdvdread)
@@ -70,7 +76,7 @@ int main()
     return *( (char *) &i );
 }
 EOF
-if ( cc -o testconf testconf.c && ./testconf ) > /dev/null 2>&1
+if ( $CC -o testconf testconf.c && ./testconf ) > /dev/null 2>&1
 then
   echo "Endian: big"
   DEFINES="$DEFINES WORDS_BIGENDIAN"
@@ -79,6 +85,39 @@ else
 fi
 rm -f testconf.c testconf
 
+#
+# Use Gnu make when available over the built in make
+#
+if ( make --version | grep GNU ) > /dev/null 2>&1
+then
+MAKE=make
+elif ( gmake --version | grep GNU ) > /dev/null 2>&1
+then
+MAKE=gmake
+else
+MAKE=make
+fi
+
+# 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
+    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`
+
 # Generate config.jam
 rm -f config.jam
 cat << EOF > config.jam
@@ -90,9 +129,23 @@ C++FLAGS = $CCFLAGS ;
 OPTIM    = $OPTIM ;
 DEFINES  = $DEFINES ;
 LINKLIBS = $LINKLIBS ;
+MAKE     = $MAKE ;
+SNAPSHOT = $SNAPSHOT ;
+BUILD_DATE = $BUILD_DATE ;
+FULL_PATH = $FULL_PATH ;
+SVN_REV = $SVN_REV ;
+CSS      = $CSS ;
 EOF
 
 echo
-echo "To build MediaFork, 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