Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 291694 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.in (-1 / +24 lines)
Lines 37-42 Link Here
37
pulse_disabled="== PulseAudio support manually disabled. =="
37
pulse_disabled="== PulseAudio support manually disabled. =="
38
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
38
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
39
faac_disabled="== FAAC support manually disabled. =="
39
faac_disabled="== FAAC support manually disabled. =="
40
mysql_not_found="Could not find required library libmysqlclient for MythTV."
41
mythtv_disabled="== MythTV support disabled. =="
40
dvdcss_enabled="== DVDCSS support enabled. =="
42
dvdcss_enabled="== DVDCSS support enabled. =="
41
dvdcss_disabled="== DVDCSS support disabled. =="
43
dvdcss_disabled="== DVDCSS support disabled. =="
42
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
44
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
Lines 160-165 Link Here
160
            [use_faac=$enableval],
162
            [use_faac=$enableval],
161
            [use_faac=yes])
163
            [use_faac=yes])
162
164
165
AC_ARG_ENABLE([mythtv],
166
            [AS_HELP_STRING([--enable-mythtv],
167
               [enable MythTV support (default is yes)])],
168
            [use_mythtv=$enableval],
169
            [use_mythtv=yes])
170
163
AC_ARG_ENABLE([dvdcss],
171
AC_ARG_ENABLE([dvdcss],
164
            [AS_HELP_STRING([--enable-dvdcss],
172
            [AS_HELP_STRING([--enable-dvdcss],
165
               [enable DVDCSS support (default is yes)])],
173
               [enable DVDCSS support (default is yes)])],
Lines 326-332 Link Here
326
AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
334
AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
327
AC_CHECK_HEADER([vorbis/vorbisenc.h],, AC_MSG_ERROR($missing_library))
335
AC_CHECK_HEADER([vorbis/vorbisenc.h],, AC_MSG_ERROR($missing_library))
328
AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
336
AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
329
AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
330
AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
337
AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
331
AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
338
AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
332
AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
339
AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
Lines 454-459 Link Here
454
  fi
461
  fi
455
fi
462
fi
456
463
464
# MySQL
465
if test "$use_mythtv" = "yes"; then
466
  AC_CHECK_LIB([mysqlclient], [main],
467
               AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]),
468
	       AC_MSG_ERROR($mysql_not_found))
469
else
470
  AC_MSG_RESULT($mythtv_disabled)
471
fi
472
457
# avahi
473
# avahi
458
if test "$host_vendor" = "apple" ; then
474
if test "$host_vendor" = "apple" ; then
459
  use_avahi="no"
475
  use_avahi="no"
Lines 870-875 Link Here
870
  final_message="$final_message\n  FAAC:\t\tNo"
886
  final_message="$final_message\n  FAAC:\t\tNo"
871
fi
887
fi
872
888
889
if test "$use_mythtv" = "yes"; then
890
  final_message="$final_message\n  MythTV:\t\tYes"
891
else
892
  final_message="$final_message\n  MythTV:\t\tNo"
893
fi
894
873
# DVDCSS
895
# DVDCSS
874
if test "$use_dvdcss" = "yes"; then
896
if test "$use_dvdcss" = "yes"; then
875
  AC_MSG_NOTICE($dvdcss_enabled)
897
  AC_MSG_NOTICE($dvdcss_enabled)
Lines 1039-1044 Link Here
1039
AC_SUBST(USE_PYTHON2_4)
1061
AC_SUBST(USE_PYTHON2_4)
1040
AC_SUBST(OUTPUT_FILES)
1062
AC_SUBST(OUTPUT_FILES)
1041
AC_SUBST(HAVE_XBMC_NONFREE)
1063
AC_SUBST(HAVE_XBMC_NONFREE)
1064
AC_SUBST(BUILD_MYTHTV)
1042
# Function to run the configure scripts in our submodules
1065
# Function to run the configure scripts in our submodules
1043
# Consists of three paramaters, the path to the submodule, the configure command
1066
# Consists of three paramaters, the path to the submodule, the configure command
1044
# with appropriate arguments, and a third parameter set to 1 if we are to skip
1067
# with appropriate arguments, and a third parameter set to 1 if we are to skip
(-)a/Makefile.in (-2 / +10 lines)
Lines 27-33 Link Here
27
	xbmc/FileSystem/MusicDatabaseDirectory \
27
	xbmc/FileSystem/MusicDatabaseDirectory \
28
	xbmc/FileSystem/VideoDatabaseDirectory \
28
	xbmc/FileSystem/VideoDatabaseDirectory \
29
	xbmc/karaoke \
29
	xbmc/karaoke \
30
	xbmc/lib/libcmyth \
31
	xbmc/lib/libhts \
30
	xbmc/lib/libhts \
32
	xbmc/lib/libGoAhead \
31
	xbmc/lib/libGoAhead \
33
	xbmc/lib/libPython \
32
	xbmc/lib/libPython \
Lines 49-54 Link Here
49
	xbmc/linux \
48
	xbmc/linux \
50
	xbmc/osx
49
	xbmc/osx
51
50
51
ifeq (@BUILD_MYTHTV@,1)
52
BIN_DIRS+=	\
53
	xbmc/lib/libcmyth
54
endif
55
52
EC_DIRS= \
56
EC_DIRS= \
53
	tools/EventClients
57
	tools/EventClients
54
58
Lines 374-385 Link Here
374
endif
378
endif
375
379
376
DYNOBJSXBMC= \
380
DYNOBJSXBMC= \
377
	xbmc/lib/libcmyth/libcmyth.a \
378
	xbmc/linux/linux.a \
381
	xbmc/linux/linux.a \
379
	xbmc/utils/utils.a \
382
	xbmc/utils/utils.a \
380
	xbmc/cores/DllLoader/exports/util/exports_utils.a \
383
	xbmc/cores/DllLoader/exports/util/exports_utils.a \
381
	xbmc/cores/DllLoader/exports/exports.a
384
	xbmc/cores/DllLoader/exports/exports.a
382
385
386
ifeq (@BUILD_MYTHTV@,1)
387
DYNOBJSXBMC+= \
388
	xbmc/lib/libcmyth/libcmyth.a
389
endif
390
383
# platform dependend objects
391
# platform dependend objects
384
ifeq ($(findstring osx,$(ARCH)), osx)
392
ifeq ($(findstring osx,$(ARCH)), osx)
385
OBJSXBMC += \
393
OBJSXBMC += \

Return to bug 291694