]> git.sesse.net Git - x264/blobdiff - configure
rm gtk, avc2avi.
[x264] / configure
index bb7c895b9ea3f87e838cdafaec5e6008f83a26aa..fa53bf2b750ab01ab6e20164d62fb48d37fc1bab 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,10 +7,10 @@ echo ""
 echo "available options:"
 echo ""
 echo "  --help                   print this message"
-echo "  --enable-avis-input      enables avisynth input (win32 only)"
-echo "  --enable-mp4-output      enables mp4 output (using gpac)"
-echo "  --enable-gtk             build GTK+ interface"
-echo "  --enable-pthread         enables multithreaded encoding"
+echo "  --disable-avis-input     disables avisynth input (win32 only)"
+echo "  --disable-mp4-output     disables mp4 output (using gpac)"
+echo "  --disable-pthread        disables multithreaded encoding"
+echo "  --disable-asm            disables assembly optimizations on x86"
 echo "  --enable-debug           adds -g, doesn't strip"
 echo "  --enable-gprof           adds -pg, doesn't strip"
 echo "  --enable-visualize       enables visualization (X11 only)"
@@ -19,32 +19,29 @@ echo "  --enable-shared          build libx264.so"
 echo "  --extra-asflags=EASFLAGS add EASFLAGS to ASFLAGS"
 echo "  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS"
 echo "  --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS"
+echo "  --host=HOST              build programs to run on HOST"
 echo ""
 exit 1
 fi
 
 cc_check() {
-    rm -f conftest*
     cat > conftest.c << EOF
 #include <$1>
 int main () { $3 return 0; }
 EOF
     $CC conftest.c $CFLAGS $LDFLAGS $2 -o conftest 2>$DEVNULL
     TMP="$?"
-    rm -f conftest*
     return $TMP
 }
 
 as_check() {
-    rm -f conftest*
     echo "$1" > conftest.asm
     $AS conftest.asm $ASFLAGS $2 -o conftest.o 2>$DEVNULL
     TMP="$?"
-    rm -f conftest*
     return $TMP
 }
 
-rm -f config.h config.mak x264.pc
+rm -f config.h config.mak x264.pc conftest*
 
 prefix='/usr/local'
 exec_prefix='${prefix}'
@@ -56,10 +53,10 @@ DEVNULL='/dev/null'
 avis_input="auto"
 mp4_output="auto"
 pthread="auto"
+asm="yes"
 debug="no"
 gprof="no"
 pic="no"
-gtk="no"
 vis="no"
 shared="no"
 
@@ -85,9 +82,100 @@ else
   exit 1
 fi
 
-MACHINE="$(./config.guess)"
+# parse options
 
-case "${MACHINE#*-*-}" in
+for opt do
+    optarg="${opt#*=}"
+    case "$opt" in
+        --prefix=*)
+            prefix="$optarg"
+            ;;
+        --exec-prefix=*)
+            exec_prefix="$optarg"
+            ;;
+        --bindir=*)
+            bindir="$optarg"
+            ;;
+        --libdir=*)
+            libdir="$optarg"
+            ;;
+        --includedir=*)
+            includedir="$optarg"
+            ;;
+        --enable-asm)
+            asm="yes"
+            ;;
+        --disable-asm)
+            asm="no"
+            ;;
+        --enable-avis-input)
+            avis_input="yes"
+            ;;
+        --disable-avis-input)
+            avis_input="no"
+            ;;
+        --enable-mp4-output)
+            mp4_output="yes"
+            ;;
+        --disable-mp4-output)
+            mp4_output="no"
+            ;;
+        --extra-asflags=*)
+            ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
+            ;;
+        --extra-cflags=*)
+            CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+            ;;
+        --extra-ldflags=*)
+            LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+            ;;
+        --enable-pthread)
+            pthread="auto" # can't skip detection, since it differs by OS
+            ;;
+        --disable-pthread)
+            pthread="no"
+            ;;
+        --enable-debug)
+            debug="yes"
+            ;;
+        --enable-gprof)
+            CFLAGS="$CFLAGS -pg"
+            LDFLAGS="$LDFLAGS -pg"
+            gprof="yes"
+            ;;
+        --enable-pic)
+            pic="yes"
+            ;;
+        --enable-shared)
+            shared="yes"
+            ;;
+        --enable-visualize)
+            LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+            CFLAGS="$CFLAGS -DVISUALIZE=1"
+            vis="yes"
+            ;;
+        --host=*)
+            host="${opt#--host=}"
+            ;;
+        *)
+            echo "Unknown option $opt, ignored"
+            ;;
+    esac
+done
+
+if [ "x$host" = x ]; then
+    host=`./config.guess`
+fi
+# normalize a triplet into a quadruplet
+host=`./config.sub $host`
+
+# split $host
+host_cpu="${host%%-*}"
+host="${host#*-}"
+host_vendor="${host%%-*}"
+host_os="${host#*-}"
+
+case $host_os in
   beos*)
     SYS="BEOS"
     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
@@ -121,7 +209,7 @@ case "${MACHINE#*-*-}" in
     LDFLAGS="$LDFLAGS -lm"
     ;;
   cygwin*)
-    SYS="CYGWIN"
+    SYS="MINGW"
     CFLAGS="$CFLAGS -mno-cygwin"
     LDFLAGS="$LDFLAGS -mno-cygwin"
     EXE=".exe"
@@ -139,22 +227,19 @@ case "${MACHINE#*-*-}" in
     HAVE_GETOPT_LONG=0
     ;;
   *)
-    echo "Unknown system $MACHINE, edit the configure"
+    echo "Unknown system $host, edit the configure"
     exit 1
     ;;
 esac
 
-case "${MACHINE%%-*}" in
+case $host_cpu in
   i*86)
     ARCH="X86"
-    AS="yasm"
     ASFLAGS="-O2"
     if [ "$SYS" = MACOSX ]; then
       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
-    elif [ "$SYS" = CYGWIN -o "$SYS" = MINGW ]; then
+    elif [ "$SYS" = MINGW ]; then
       ASFLAGS="$ASFLAGS -f win32 -DPREFIX"
-    elif [ "$SYS" = NETBSD ]; then
-      ASFLAGS="$ASFLAGS -f aoutb"
     else
       ASFLAGS="$ASFLAGS -f elf"
     fi
@@ -162,8 +247,13 @@ case "${MACHINE%%-*}" in
     ;;
   x86_64)
     ARCH="X86_64"
-    AS="yasm"
-    ASFLAGS="-f elf -m amd64"
+    if [ "$SYS" = MACOSX ];then
+      ASFLAGS="-f macho64 -m amd64 -DPIC -DPREFIX"
+      CFLAGS="$CFLAGS -arch x86_64"
+      LDFLAGS="$LDFLAGS -arch x86_64"
+    else
+      ASFLAGS="-f elf -m amd64"
+    fi
     ;;
   powerpc|powerpc64)
     ARCH="PPC"
@@ -198,122 +288,35 @@ case "${MACHINE%%-*}" in
     ARCH="PARISC"
     ;;
   *)
-    ARCH="$(echo ${MACHINE%%-*} | tr a-z A-Z)"
+    ARCH="$(echo $host_cpu | tr a-z A-Z)"
     ;;
 esac
 
 # check requirements
 
-if [ $SYS = MACOSX -a $ARCH = X86 ]
-then
-  # we want Apple's nasm from Xcode 2.4.1 or later
-  NASM_BUILD_REQUIRED=11
-  NASM_BUILD=`nasm -v|grep "Apple Computer"|sed 's/.*build \([0-9]*\).*/\1/'`
-  if [ $NASM_BUILD -lt $NASM_BUILD_REQUIRED ]
-  then
-    echo "Your version of 'nasm' is too old."
-    echo "Please install Xcode 2.4.1 or later."
-    AS=""
-  fi
+if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" \) ] ; then
+    pic="yes"
 fi
 
-if [ $ARCH = X86 -o $ARCH = X86_64 ] ; then
-    if as_check ; then
-        CFLAGS="$CFLAGS -DHAVE_MMX"
-    fi
+if [ $asm = yes -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
     if as_check "pabsw xmm0, xmm0" ; then
-        ASFLAGS="$ASFLAGS -DHAVE_SSE3"
-        CFLAGS="$CFLAGS -DHAVE_SSE3"
-    fi
-    if ! as_check ; then
-        echo "No suitable assembler found.  x264 will be several times slower."
-        echo "Please install 'yasm' to get MMX/SSE optimized code."
-        AS=""
+        CFLAGS="$CFLAGS -DHAVE_MMX"
+    else
+        VER=`([ $AS == nasm ] && nasm -v || $AS --version || echo no assembler) 2>$DEVNULL | head -n 1`
+        echo "Found $VER"
+        echo "Minimum version is yasm-0.6.1 or nasm-2.0"
+        echo "If you really want to compile without asm, configure with --disable-asm."
+        exit 1
     fi
+else
+    AS=""
 fi
 
 CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
 
-# parse options
-
-for opt do
-    optarg="${opt#*=}"
-    case "$opt" in
-        --prefix=*)
-            prefix="$optarg"
-            ;;
-        --exec-prefix=*)
-            exec_prefix="$optarg"
-            ;;
-        --bindir=*)
-            bindir="$optarg"
-            ;;
-        --libdir=*)
-            libdir="$optarg"
-            ;;
-        --includedir=*)
-            includedir="$optarg"
-            ;;
-        --enable-avis-input)
-            avis_input="yes"
-            ;;
-        --disable-avis-input)
-            avis_input="no"
-            ;;
-        --enable-mp4-output)
-            mp4_output="yes"
-            ;;
-        --disable-mp4-output)
-            mp4_output="no"
-            ;;
-        --extra-asflags=*)
-            ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
-            ;;
-        --extra-cflags=*)
-            CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
-            ;;
-        --extra-ldflags=*)
-            LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
-            ;;
-        --enable-pthread)
-            pthread="auto" # can't skip detection, since it differs by OS
-            ;;
-        --disable-pthread)
-            pthread="no"
-            ;;
-        --enable-debug)
-            debug="yes"
-            ;;
-        --enable-gprof)
-            CFLAGS="$CFLAGS -pg"
-            LDFLAGS="$LDFLAGS -pg"
-            gprof="yes"
-            ;;
-        --enable-pic)
-            pic="yes"
-            ;;
-        --enable-gtk)
-            gtk="yes"
-            ;;
-        --disable-gtk)
-            gtk="no"
-            ;;
-        --enable-shared)
-            shared="yes"
-            if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
-                pic="yes"
-            fi
-            ;;
-        --enable-visualize)
-            LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
-            CFLAGS="$CFLAGS -DVISUALIZE=1"
-            vis="yes"
-            ;;
-        *)
-            echo "Unknown option $opt, ignored"
-            ;;
-    esac
-done
+echo "unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';" > conftest.c
+$CC $CFLAGS conftest.c -c -o conftest.o 2>$DEVNULL || die "endian test failed"
+grep -q BIGE conftest.o && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
 
 # autodetect options that weren't forced nor disabled
 
@@ -324,7 +327,7 @@ if test "$pthread" = "auto" ; then
         BEOS)
             pthread="yes"
             ;;
-        MINGW|CYGWIN)
+        MINGW)
             if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then
                 pthread="yes"
                 libpthread="-lpthread"
@@ -333,7 +336,7 @@ if test "$pthread" = "auto" ; then
                 libpthread="-lpthreadGC2"
             elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then
                 pthread="yes"
-                libpthread="-lpthreadGC2 -lwsock32"\
+                libpthread="-lpthreadGC2 -lwsock32"
                 CFLAGS="$CFLAGS -DPTW32_STATIC_LIB"
             fi
             ;;
@@ -348,7 +351,7 @@ if test "$pthread" = "yes" ; then
 fi
 
 MP4_LDFLAGS="-lgpac_static"
-if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
+if [ $SYS = MINGW ]; then
     MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
 fi
 if [ "$mp4_output" = "auto" ] ; then
@@ -361,7 +364,7 @@ if [ "$mp4_output" = "yes" ] ; then
 fi
 
 if [ "$avis_input" = "auto" ] ; then
-    if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
+    if [ $SYS = MINGW ]; then
         avis_input="yes"
     else
         avis_input="no";
@@ -374,7 +377,9 @@ fi
 
 if [ "$pic" = "yes" ] ; then
     CFLAGS="$CFLAGS -fPIC"
-    ASFLAGS="$ASFLAGS -D__PIC__"
+    ASFLAGS="$ASFLAGS -DPIC"
+    # resolve textrels in the x86 asm
+    cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
 fi
 
 if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
@@ -396,6 +401,8 @@ elif cc_check "stdio.h" "" "fseeko64(stdin,0,0);" ; then
     echo "#define ftell ftello64" >> config.h
 fi
 
+rm -f conftest*
+
 # generate config files
 
 cat > config.mak << EOF
@@ -412,7 +419,6 @@ ALTIVECFLAGS=$ALTIVECFLAGS
 LDFLAGS=$LDFLAGS
 AS=$AS
 ASFLAGS=$ASFLAGS
-GTK=$gtk
 EXE=$EXE
 VIS=$vis
 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
@@ -426,20 +432,22 @@ for A in "$@" ; do
 done
 echo '' >> config.mak
 
-cp config.mak gtk/config.mak
-
 if [ "$shared" = "yes" ]; then
     API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
-    echo "SONAME=libx264.so.$API" >> config.mak
-    echo 'default: $(SONAME)' >> config.mak
-    if [ "$gtk" = "yes" ]; then
-        echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
+    if [ "$SYS" = "MINGW" ]; then
+        echo "SONAME=libx264-$API.dll" >> config.mak
+        echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
+        echo 'SOFLAGS=-Wl,--out-implib,$(IMPLIBNAME) -Wl,--enable-auto-image-base' >> config.mak
+    elif [ "$SYS" = "MACOSX" ]; then
+        echo "SOSUFFIX=dylib" >> config.mak
+        echo "SONAME=libx264.$API.dylib" >> config.mak
+        echo 'SOFLAGS=-dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress -install_name $(DESTDIR)$(libdir)/$(SONAME)' >> config.mak
+    else
+        echo "SOSUFFIX=so" >> config.mak
+        echo "SONAME=libx264.so.$API" >> config.mak
+        echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
     fi
-fi
-
-if [ "$gtk" = "yes" ]; then
-    echo 'default: libx264gtk.a' >> config.mak
-    echo 'install: install-gtk' >> config.mak
+    echo 'default: $(SONAME)' >> config.mak
 fi
 
 ./version.sh
@@ -462,10 +470,10 @@ EOF
 
 echo "Platform:   $ARCH"
 echo "System:     $SYS"
+echo "asm:        $asm"
 echo "avis input: $avis_input"
 echo "mp4 output: $mp4_output"
 echo "pthread:    $pthread"
-echo "gtk:        $gtk"
 echo "debug:      $debug"
 echo "gprof:      $gprof"
 echo "PIC:        $pic"