X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=configure;h=f27f2ba6662c030c587bc6cb72783cb31560093d;hb=28b197219fe781529c60d1f445b8b3a1de0d19b4;hp=d0c292873c9d3bdbd2ff098822f466336fa08c04;hpb=cdba71d1dca214142fdcca4c52f7672252752c2e;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/configure b/configure
index d0c29287..f27f2ba6 100755
--- a/configure
+++ b/configure
@@ -4,6 +4,8 @@ CC="gcc"
 CXX="g++"
 CCFLAGS="$CCFLAGS -Wall -g"
 OPTIM="$OPTIM -O3 -funroll-loops"
+LINKLIBS="-lz"
+MAKE=make
 
 # System-specific flags
 SYSTEM=`uname -s`
@@ -31,25 +33,34 @@ case $SYSTEM in
     ;;
 
   Darwin)
-    DEFINES="$DEFINES SYS_DARWIN"
+    DEFINES="$DEFINES SYS_DARWIN USE_PTHREAD"
     LINKLIBS="$LINKLIBS -lpthread"
     ;;
 
   FreeBSD)
-    DEFINES="$DEFINES SYS_FREEBSD"
+    DEFINES="$DEFINES SYS_FREEBSD USE_PTHREAD"
     LINKLIBS="$LINKLIBS -pthread"
     ;;
 
   NetBSD)
-    DEFINES="$DEFINES SYS_NETBSD"
+    DEFINES="$DEFINES SYS_NETBSD USE_PTHREAD"
     LINKLIBS="$LINKLIBS -lpthread"
     ;;
 
   Linux)
-    DEFINES="$DEFINES SYS_LINUX"
+    DEFINES="$DEFINES SYS_LINUX USE_PTHREAD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64"
     LINKLIBS="$LINKLIBS -lpthread"
     ;;
 
+  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 ;;
@@ -64,7 +75,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"
@@ -73,6 +84,19 @@ 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
+
 # Generate config.jam
 rm -f config.jam
 cat << EOF > config.jam
@@ -84,7 +108,10 @@ C++FLAGS = $CCFLAGS ;
 OPTIM    = $OPTIM ;
 DEFINES  = $DEFINES ;
 LINKLIBS = $LINKLIBS ;
+MAKE     = $MAKE ;
 EOF
 
 echo
-echo "To build HandBrake, run 'jam'."
+echo "To build HandBrake, run:"
+echo " './jam' on a Mac (or 'make' to try the UB build method),"
+echo " 'jam' on Linux or Windows."