Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xine-lib/patches/xine-lib-1.1.0-configure.patch

    Contents of /trunk/xine-lib/patches/xine-lib-1.1.0-configure.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 12545 byte(s) 
    -import
    1 diff -ur -x '*~' xine-lib-1.1.0/configure.ac xine-lib-1.1.0-00_all_configure/configure.ac
    2 --- xine-lib-1.1.0/configure.ac 2005-07-21 23:10:10.000000000 +0200
    3 +++ xine-lib-1.1.0-00_all_configure/configure.ac 2005-07-26 23:37:27.939638528 +0200
    4 @@ -506,8 +506,15 @@
    5 dnl ----------------------------------------------
    6 dnl Check for usable video-for-linux (v4l) support
    7 dnl ----------------------------------------------
    8 +AC_ARG_ENABLE([v4l],
    9 + AC_HELP_STRING([--disable-v4l], [do not build Video4Linux support]),
    10 + [with_v4l=${enableval}], [with_v4l=yes])
    11
    12 -AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes,)
    13 +if test "x$with_v4l" == "xyes"; then
    14 + AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes,)
    15 +else
    16 + have_v4l=no
    17 +fi
    18 AM_CONDITIONAL(HAVE_V4L, [test x"$have_v4l" = "xyes"])
    19
    20
    21 @@ -722,11 +729,19 @@
    22 dnl Checks for Xinerama extension
    23 dnl ---------------------------------------------
    24
    25 -AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
    26 +AC_ARG_ENABLE([xinerama],
    27 + AC_HELP_STRING([--disable-xinerama], [do not build Xinerama support]),
    28 + [with_xinerama=$enableval], [with_xinerama=yes])
    29 +
    30 +if test "x$with_xinerama" = "xyes"; then
    31 + AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
    32 [X_LIBS="$X_LIBS -lXinerama"
    33 AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
    34 ac_have_xinerama="yes"],,
    35 [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
    36 +else
    37 + ac_have_xinerama=no
    38 +fi
    39 dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
    40
    41
    42 @@ -734,13 +749,14 @@
    43 dnl Checks for Ascii-Art library
    44 dnl ---------------------------------------------
    45
    46 -AC_ARG_ENABLE(aalib,
    47 - AC_HELP_STRING([--disable-aalib], [do not build aalib]),
    48 - disable_aalib=yes,
    49 - disable_aalib=no)
    50 +AC_ARG_ENABLE([aalib],
    51 + AC_HELP_STRING([--disable-aalib], [do not build AALIB support]),
    52 + [with_aalib=$enableval], [with_aalib=yes])
    53
    54 -if test x$disable_aalib = "xno"; then
    55 -AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
    56 +if test "x$with_aalib" = "xyes"; then
    57 + AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
    58 +else
    59 + no_aalib=yes
    60 fi
    61
    62 AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
    63 @@ -749,9 +765,16 @@
    64 dnl Checks for Color AsCii Art library
    65 dnl ---------------------------------------------
    66
    67 -AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
    68 -AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes")
    69 +AC_ARG_ENABLE([caca],
    70 + AC_HELP_STRING([--disable-caca], [do not build CACA support]),
    71 + [with_caca=$enableval], [with_caca=yes])
    72
    73 +if test "x$with_caca" = "xyes"; then
    74 + AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
    75 +else
    76 + no_caca=yes
    77 +fi
    78 +AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes")
    79
    80 dnl ---------------------------------------------
    81 dnl Check solaris framebuffer device support
    82 @@ -855,9 +878,17 @@
    83 dnl check for SDL
    84 dnl ---------------------------------------------
    85
    86 -AM_PATH_SDL(1.1.5,
    87 - AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
    88 - [])
    89 +AC_ARG_ENABLE([sdl],
    90 + AC_HELP_STRING([--disable-sdl], [do not build SDL support]),
    91 + [with_sdl=$enableval], [with_sdl=yes])
    92 +
    93 +if test "x$with_sdl" = "xyes"; then
    94 + AM_PATH_SDL(1.1.5,
    95 + AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
    96 + [])
    97 +else
    98 + no_sdl=yes
    99 +fi
    100 AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
    101
    102
    103 @@ -891,26 +922,34 @@
    104 dnl check for polypaudio
    105 dnl ---------------------------------------------
    106
    107 -AC_MSG_CHECKING(for polypaudio)
    108 -dnl do some actual testing here
    109 -if test x$PKG_CONFIG = xno ; then
    110 - AC_MSG_RESULT(no)
    111 - echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net"
    112 - echo "*** All of polypaudio dependent parts will be disabled"
    113 +AC_ARG_ENABLE([polypaudio],
    114 + AC_HELP_STRING([--disable-polypaudio], [do not build Polypaudio support]),
    115 + [with_polypaudio=$enableval], [with_polypaudio=yes])
    116 +
    117 +if test "x$with_polypaudio" = "xyes"; then
    118 + AC_MSG_CHECKING(for polypaudio)
    119 + dnl do some actual testing here
    120 + if test x$PKG_CONFIG = xno ; then
    121 + AC_MSG_RESULT(no)
    122 + echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net"
    123 + echo "*** All of polypaudio dependent parts will be disabled"
    124 + else
    125 + POLYPAUDIO_REQUIRED_VERSION=0.6
    126 + if $PKG_CONFIG --atleast-version $POLYPAUDIO_REQUIRED_VERSION polyplib ; then
    127 + POLYPAUDIO_CFLAGS=`$PKG_CONFIG --cflags polyplib`
    128 + POLYPAUDIO_LIBS=`$PKG_CONFIG --libs polyplib`
    129 + have_polypaudio="yes"
    130 + AC_MSG_RESULT(yes)
    131 + else
    132 + AC_MSG_RESULT(no)
    133 + AC_MSG_RESULT([*** All of polypaudio dependent parts will be disabled ***])
    134 + fi
    135 + fi
    136 + AC_SUBST(POLYPAUDIO_CFLAGS)
    137 + AC_SUBST(POLYPAUDIO_LIBS)
    138 else
    139 - POLYPAUDIO_REQUIRED_VERSION=0.6
    140 - if $PKG_CONFIG --atleast-version $POLYPAUDIO_REQUIRED_VERSION polyplib ; then
    141 - POLYPAUDIO_CFLAGS=`$PKG_CONFIG --cflags polyplib`
    142 - POLYPAUDIO_LIBS=`$PKG_CONFIG --libs polyplib`
    143 - have_polypaudio="yes"
    144 - AC_MSG_RESULT(yes)
    145 - else
    146 - AC_MSG_RESULT(no)
    147 - AC_MSG_RESULT([*** All of polypaudio dependent parts will be disabled ***])
    148 - fi
    149 + have_polypaudio=no
    150 fi
    151 -AC_SUBST(POLYPAUDIO_CFLAGS)
    152 -AC_SUBST(POLYPAUDIO_LIBS)
    153 AM_CONDITIONAL(HAVE_POLYPAUDIO, [test x"$have_polypaudio" = x"yes"])
    154
    155 dnl ---------------------------------------------
    156 @@ -1024,27 +1063,32 @@
    157 dnl ---------------------------------------------
    158 dnl Ogg/Speex libs.
    159 dnl ---------------------------------------------
    160 -
    161 -PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes")
    162 -
    163 -if test "x$no_speex" = "xyes" ; then
    164 - AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")])
    165 +AC_ARG_ENABLE([speex],
    166 + AC_HELP_STRING([--disable-speex], [do not build speex support]),
    167 + [with_speex=$enableval], [with_speex=yes])
    168 +
    169 +no_speex=yes
    170 +
    171 +if test "x$with_speex" = "xyes"; then
    172 + PKG_CHECK_MODULES(SPEEX, speex, [
    173 + no_speex=no
    174 +
    175 + AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
    176 +
    177 + dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
    178 + dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
    179 + AC_CHECK_HEADER([speex/speex.h], [
    180 + AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
    181 + ])
    182 + ], no_speex="yes")
    183 fi
    184
    185 if test "x$no_speex" = "xyes" ; then
    186 AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
    187 -else
    188 - AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
    189 -
    190 - dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
    191 - dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
    192 - AC_CHECK_HEADER([speex/speex.h],
    193 - AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
    194 - )
    195 -
    196 - AC_SUBST(SPEEX_CFLAGS)
    197 - AC_SUBST(SPEEX_LIBS)
    198 fi
    199 +
    200 +AC_SUBST(SPEEX_CFLAGS)
    201 +AC_SUBST(SPEEX_LIBS)
    202 AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
    203
    204
    205 @@ -1052,8 +1096,16 @@
    206 dnl check for libFLAC
    207 dnl ---------------------------------------------
    208
    209 -AM_PATH_LIBFLAC([],
    210 - AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
    211 +AC_ARG_ENABLE([flac],
    212 + AC_HELP_STRING([--disable-flac], [do not build flac support]),
    213 + [with_flac=$enableval], [with_flac=yes])
    214 +
    215 +if test "x$with_flac" = "xyes"; then
    216 + AM_PATH_LIBFLAC([],
    217 + AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
    218 +else
    219 + no_libFLAC=yes
    220 +fi
    221 AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
    222
    223 dnl ---------------------------------------------
    224 @@ -1120,14 +1172,22 @@
    225 dnl MNG libs.
    226 dnl ---------------------------------------------
    227
    228 -AC_CHECK_LIB(mng, mng_initialize,
    229 +AC_ARG_ENABLE([mng],
    230 + AC_HELP_STRING([--disable-mng], [do not build mng support]),
    231 + [with_mng=$enableval], [with_mng=yes])
    232 +
    233 +if test "x$with_mng" = "xyes"; then
    234 + AC_CHECK_LIB(mng, mng_initialize,
    235 [ AC_CHECK_HEADER(libmng.h,
    236 [ have_libmng=yes
    237 MNG_LIBS="-lmng" ],
    238 AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
    239 AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
    240 + AC_SUBST(MNG_LIBS)
    241 +else
    242 + have_libmng=no
    243 +fi
    244 AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
    245 -AC_SUBST(MNG_LIBS)
    246
    247 dnl ---------------------------------------------
    248 dnl MagickWand API of Imagemagick.
    249 @@ -1159,10 +1219,14 @@
    250 dnl ---------------------------------------------
    251 dnl OSS style audio interface
    252 dnl ---------------------------------------------
    253 -
    254 -AC_MSG_CHECKING(for OSS audio support)
    255 -have_ossaudio=no
    256 -AC_TRY_COMPILE([
    257 +AC_ARG_ENABLE([oss],
    258 + AC_HELP_STRING([--disable-oss], [do not build OSS support]),
    259 + [with_oss=$enableval], [with_oss=yes])
    260 +
    261 +if test "x$with_oss" = "xyes"; then
    262 + AC_MSG_CHECKING(for OSS audio support)
    263 + have_ossaudio=no
    264 + AC_TRY_COMPILE([
    265 #ifdef __NetBSD__
    266 #include <soundcard.h>
    267 #else
    268 @@ -1173,7 +1237,10 @@
    269 ],[
    270 have_ossaudio=yes
    271 ])
    272 -AC_MSG_RESULT($have_ossaudio)
    273 + AC_MSG_RESULT($have_ossaudio)
    274 +else
    275 + have_ossaudio=no
    276 +fi
    277 AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
    278
    279
    280 @@ -1196,9 +1263,17 @@
    281 dnl ESD support
    282 dnl ---------------------------------------------
    283
    284 -AM_PATH_ESD(0.2.8,
    285 +AC_ARG_ENABLE([esd],
    286 + AC_HELP_STRING([--disable-esd], [do not build esd support]),
    287 + [with_esd=$enableval], [with_esd=yes])
    288 +
    289 +if test "x$with_esd" = "xyes"; then
    290 + AM_PATH_ESD(0.2.8,
    291 AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
    292 AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
    293 +else
    294 + no_esd=yes
    295 +fi
    296 AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
    297
    298
    299 @@ -1206,9 +1281,17 @@
    300 dnl ARTS support
    301 dnl ---------------------------------------------
    302
    303 -AM_PATH_ARTS(0.9.5,
    304 +AC_ARG_ENABLE([arts],
    305 + AC_HELP_STRING([--disable-arts], [do not build arts support]),
    306 + [with_arts=$enableval], [with_arts=yes])
    307 +
    308 +if test "x$with_arts" = "xyes"; then
    309 + AM_PATH_ARTS(0.9.5,
    310 AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
    311 AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
    312 +else
    313 + no_arts=yes
    314 +fi
    315 AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
    316
    317
    318 @@ -1216,15 +1299,23 @@
    319 dnl gnome-vfs support
    320 dnl ---------------------------------------------
    321
    322 -PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
    323 +AC_ARG_ENABLE([gnome],
    324 + AC_HELP_STRING([--disable-gnome], [do not build gnome-vfs support]),
    325 + [with_gnome=$enableval], [with_gnome=yes])
    326 +
    327 +if test "x$with_gnome" = "xyes"; then
    328 + PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
    329 no_gnome_vfs=no,
    330 no_gnome_vfs=yes)
    331 -AC_SUBST(GNOME_VFS_CFLAGS)
    332 -AC_SUBST(GNOME_VFS_LIBS)
    333 -if test x"$no_gnome_vfs" != "xyes"; then
    334 -AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
    335 + AC_SUBST(GNOME_VFS_CFLAGS)
    336 + AC_SUBST(GNOME_VFS_LIBS)
    337 + if test x"$no_gnome_vfs" != "xyes"; then
    338 + AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
    339 + else
    340 + AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
    341 + fi
    342 else
    343 -AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
    344 + no_gnome_vfs=yes
    345 fi
    346 AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
    347
    348 @@ -1233,14 +1324,20 @@
    349 dnl libsmbclient support
    350 dnl ---------------------------------------------
    351
    352 -AC_CHECK_LIB(smbclient, smbc_init,
    353 +AC_ARG_ENABLE([samba],
    354 + AC_HELP_STRING([--disable-samba], [do not build Samba support]),
    355 + [with_samba=$enableval], [with_samba=yes])
    356 +
    357 +if test "x$with_samba" = "xyes"; then
    358 + AC_CHECK_LIB(smbclient, smbc_init,
    359 [ AC_CHECK_HEADER(libsmbclient.h,
    360 [ have_libsmbclient=yes
    361 LIBSMBCLIENT_LIBS="-lsmbclient" ],
    362 AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))],
    363 AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))
    364 + AC_SUBST(LIBSMBCLIENT_LIBS)
    365 +fi
    366 AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test x"$have_libsmbclient" = "xyes")
    367 -AC_SUBST(LIBSMBCLIENT_LIBS)
    368
    369
    370 dnl ---------------------------------------------
    371 @@ -2573,7 +2670,9 @@
    372 echo " - MS ADPCM - IMA ADPCM"
    373 echo " - XA ADPCM - Game DPCM/ADPCM"
    374 echo " - Mace 3:13 - Mace 6:1"
    375 -echo " - FLAC"
    376 +if test x"no_libFLAC" != "xyes"; then
    377 + echo " - FLAC"
    378 +fi
    379 if test x"$no_vorbis" != "xyes"; then
    380 echo " - vorbis"
    381 fi