Attachment #216223 for bug #271050

View | Details | Raw Unified | Return to bug 271050
Collapse All | Expand All




            [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
            [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
AC_ARG_WITH(pulse,     AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
            [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])

    CFLAGS="$save_CFLAGS"
fi

dnl **** Check for PulseAudio ****
if test "x$with_pulse" != "xno"; then
    if test "$PKG_CONFIG" != "false"; then
        AC_MSG_CHECKING([for pulseaudio >= 0.9.14])
        if "$PKG_CONFIG" --atleast-version=0.9.14 libpulse; then
            have_pulseaudio="yes"
        else
            have_pulseaudio="no"
        fi
        AC_MSG_RESULT([$have_pulseaudio])
        if test x"$have_pulseaudio" = xyes; then
            ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
            AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
            AC_SUBST(PULSELIBS, "$ac_pulse_libs")
	else
            dnl This warning should be removed if ever commited.
            dnl Only useful to show that the problem wasn't the patch.
            WINE_WARNING([libpulse not found or too old. Pulseaudio support will NOT be built.])
        fi
    fi
fi


dnl **** Check for ALSA 1.x ****
AC_SUBST(ALSALIBS,"")
if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"

WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])

dnl **** Check for any sound system ****
if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
        "$ac_cv_header_sys_soundcard_h" != "yes" -a \
        "$ac_cv_header_machine_soundcard_h" != "yes" -a \
        "$ac_cv_header_soundcard_h" != "yes" -a \

WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

Return to bug 271050

Lines 64-69 Link Here

(-)/var/tmp/portage/app-emulation/wine-1.1.30/work/wine-1.1.30/configure.ac (-1 / +26 lines)
64	[if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])	64	[if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
65	AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),	65	AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
66	[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])	66	[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
		67	AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
67	AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))	68	AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
68	AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),	69	AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
69	[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])	70	[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
Lines 1296-1301 Link Here
1296	CFLAGS="$save_CFLAGS"	1297	CFLAGS="$save_CFLAGS"
1297	fi	1298	fi
1298		1299
		1300	dnl ** Check for PulseAudio **
		1301	if test "x$with_pulse" != "xno"; then
		1302	if test "$PKG_CONFIG" != "false"; then
		1303	AC_MSG_CHECKING([for pulseaudio >= 0.9.14])
		1304	if "$PKG_CONFIG" --atleast-version=0.9.14 libpulse; then
		1305	have_pulseaudio="yes"
		1306	else
		1307	have_pulseaudio="no"
		1308	fi
		1309	AC_MSG_RESULT([$have_pulseaudio])
		1310	if test x"$have_pulseaudio" = xyes; then
		1311	ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
		1312	AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
		1313	AC_SUBST(PULSELIBS, "$ac_pulse_libs")
		1314	else
		1315	dnl This warning should be removed if ever commited.
		1316	dnl Only useful to show that the problem wasn't the patch.
		1317	WINE_WARNING([libpulse not found or too old. Pulseaudio support will NOT be built.])
		1318	fi
		1319	fi
		1320	fi
		1321
		1322
1299	dnl ** Check for ALSA 1.x **	1323	dnl ** Check for ALSA 1.x **
1300	AC_SUBST(ALSALIBS,"")	1324	AC_SUBST(ALSALIBS,"")
1301	if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"	1325	if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
Lines 1448-1454 Link Here
1448	WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])	1472	WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
1449		1473
1450	dnl ** Check for any sound system **	1474	dnl ** Check for any sound system **
1451	if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \	1475	if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
1452	"$ac_cv_header_sys_soundcard_h" != "yes" -a \	1476	"$ac_cv_header_sys_soundcard_h" != "yes" -a \
1453	"$ac_cv_header_machine_soundcard_h" != "yes" -a \	1477	"$ac_cv_header_machine_soundcard_h" != "yes" -a \
1454	"$ac_cv_header_soundcard_h" != "yes" -a \	1478	"$ac_cv_header_soundcard_h" != "yes" -a \
Lines 2494-2499 Link Here
2494	WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])	2518	WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
2495	WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])	2519	WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
2496	WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])	2520	WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
		2521	WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
2497	WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])	2522	WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
2498	WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])	2523	WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
2499	WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])	2524	WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])