Revision fdf11906 configure

View differences:

configure
82 82
  echo "  --disable-ffserver       disable ffserver build"
83 83
  echo "  --enable-postproc        enable GPLed postprocessing support [no]"
84 84
  echo "  --enable-swscale         enable GPLed software scaler support [no]"
85
  echo "  --enable-avfilter        video filter support (replaces vhook) [no]"
85
  echo "  --enable-avfilter        video filter support [no]"
86 86
  echo "  --enable-avfilter-lavf   video filters dependent on avformat [no]"
87
  echo "  --disable-vhook          disable video hooking support"
88 87
  echo "  --enable-beosthreads     use BeOS threads [no]"
89 88
  echo "  --enable-os2threads      use OS/2 threads [no]"
90 89
  echo "  --enable-pthreads        use pthreads [no]"
......
799 798
    static
800 799
    swscale
801 800
    vdpau
802
    vhook
803 801
    x11grab
804 802
    zlib
805 803
"
......
873 871
    fast_cmov
874 872
    fast_unaligned
875 873
    fork
876
    freetype2
877 874
    gethrtime
878 875
    GetProcessTimes
879 876
    getrusage
880
    imlib2
881 877
    inet_aton
882 878
    inline_asm
883 879
    libdc1394_1
......
1133 1129
ffplay_deps="sdl"
1134 1130
ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer"
1135 1131
ffserver_extralibs='$ldl'
1136
vhook_extralibs='$ldl'
1137 1132

  
1138 1133

  
1139 1134
# default parameters
......
1180 1175
enable protocols
1181 1176
enable static
1182 1177
enable stripping
1183
vhook="default"
1184 1178

  
1185 1179
# build settings
1186 1180
add_cflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
1187 1181
SHFLAGS='-shared -Wl,-soname,$$(@F)'
1188
VHOOKSHFLAGS='$(SHFLAGS)'
1189 1182
FFSERVERLDFLAGS=-Wl,-E
1190 1183
LIBPREF="lib"
1191 1184
LIBSUF=".a"
......
1560 1553
    darwin)
1561 1554
        disable need_memalign
1562 1555
        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
1563
        VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$(@F)'
1564 1556
        strip="strip -x"
1565 1557
        FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
1566 1558
        SLIBSUF=".dylib"
......
1578 1570
            LIBTARGET=x64
1579 1571
        fi
1580 1572
        shlibdir_default="$bindir_default"
1581
        VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
1582
        VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
1583
        if enabled swscale; then
1584
            VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
1585
            VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
1586
        fi
1587 1573
        disable ffserver
1588 1574
        SLIBPREF=""
1589 1575
        SLIBSUF=".dll"
......
1607 1593
    cygwin*)
1608 1594
        target_os=cygwin
1609 1595
        shlibdir_default="$bindir_default"
1610
        VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
1611
        VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
1612
        if enabled swscale; then
1613
            VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
1614
            VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
1615
        fi
1616 1596
        SLIBPREF="cyg"
1617 1597
        SLIBSUF=".dll"
1618 1598
        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
......
1622 1602
        enable dos_paths
1623 1603
        ;;
1624 1604
    *-dos|freedos|opendos)
1625
        disable ffplay ffserver vhook
1605
        disable ffplay ffserver
1626 1606
        disable $INDEV_LIST $OUTDEV_LIST
1627 1607
        network_extralibs="-lsocket"
1628 1608
        objformat="coff"
......
1656 1636
          emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
1657 1637
        SLIB_INSTALL_EXTRA_CMD='install -m 644 $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib "$(LIBDIR)"'
1658 1638
        SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib'
1659
        disable vhook
1660 1639
        enable dos_paths
1661 1640
        ;;
1662
    interix)
1663
        disable vhook
1664
        ;;
1665 1641

  
1666 1642
    *)
1667 1643
        die "Unknown OS '$target_os'."
......
2040 2016
EOF
2041 2017
done
2042 2018

  
2043
test "$vhook" = "default" && vhook="$dlopen"
2044

  
2045
if test "$target_os" = cygwin -o "$target_os" = mingw32 && enabled_all static vhook ; then
2046
    disable vhook
2047
    echo
2048
    echo "At the moment vhooks don't work on Cygwin or MinGW static builds."
2049
    echo "Patches welcome."
2050
    echo
2051
fi
2052

  
2053
if enabled vhook; then
2054
    check_ldflags -rdynamic
2055
    check_ldflags -export-dynamic
2056
fi
2057

  
2058
check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
2059
check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
2060

  
2061 2019
##########################################
2062 2020
# SDL check
2063 2021

  
......
2225 2183
    add_ldflags -p
2226 2184
fi
2227 2185

  
2228
VHOOKCFLAGS="-fPIC"
2229

  
2230 2186
# Find out if the .align argument is a power of two or not.
2231 2187
check_asm asmalign_pot '".align 3"'
2232 2188

  
......
2312 2268
echo "software scaler enabled   ${swscale-no}"
2313 2269
echo "new filter support        ${avfilter-no}"
2314 2270
echo "filters using lavformat   ${avfilter_lavf-no}"
2315
echo "video hooking             ${vhook-no}"
2316
if enabled vhook; then
2317
    echo "Imlib2 support            ${imlib2-no}"
2318
    echo "FreeType support          ${freetype2-no}"
2319
fi
2320 2271
echo "network support           ${network-no}"
2321 2272
if enabled network; then
2322 2273
    echo "IPv6 support              ${ipv6-no}"
......
2395 2346
    echo "STRIP=echo ignoring strip" >> config.mak
2396 2347

  
2397 2348
echo "OPTFLAGS=$CFLAGS" >> config.mak
2398
echo "VHOOKCFLAGS=$VHOOKCFLAGS" >> config.mak
2399 2349
echo "LDFLAGS=$LDFLAGS" >> config.mak
2400 2350
echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
2401 2351
echo "SHFLAGS=$SHFLAGS" >> config.mak
2402 2352
echo "YASMFLAGS=$YASMFLAGS" >> config.mak
2403
echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak
2404
echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak
2405 2353
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
2406 2354
echo "BUILD_STATIC=$static" >> config.mak
2407 2355
echo "BUILDSUF=$build_suffix" >> config.mak
......
2529 2477
        libswscale        \
2530 2478
        tests             \
2531 2479
        tools             \
2532
        vhook             \
2533 2480
        "
2534 2481
    FILES="\
2535 2482
        Makefile             \

Also available in: Unified diff