parent
3b7ac3b389
commit
1421866e20
39
configure.in
39
configure.in
|
@ -85,7 +85,7 @@ AC_ARG_ENABLE(sound,
|
|||
enable_sound=yes)
|
||||
if test "x$enable_sound" = "xyes"; then
|
||||
AC_ARG_ENABLE(sound_pulse,
|
||||
[ --enable-sound-pulse compile with PulseAudio sound support @<:@default=no@:>@],,
|
||||
[ --enable-sound-pulse compile with PulseAudio sound support (experimental) @<:@default=no@:>@],,
|
||||
enable_sound_pulse=no)
|
||||
AC_ARG_ENABLE(sound_esound,
|
||||
[ --enable-sound-esound compile with EsounD sound support @<:@default=yes@:>@],,
|
||||
|
@ -230,7 +230,7 @@ if test "x$enable_xsync" = "xyes"; then
|
|||
fi
|
||||
|
||||
AC_ARG_ENABLE(xscrnsaver,
|
||||
[ --enable-xscrnsaver compile with ScreenSaver support (experimental!) @<:@default=no@:>@],,
|
||||
[ --enable-xscrnsaver compile with ScreenSaver support (experimental/not useful) @<:@default=no@:>@],,
|
||||
enable_xscrnsaver=no)
|
||||
if test "x$enable_xscrnsaver" = "xyes"; then
|
||||
AC_CHECK_LIB(Xss, XScreenSaverQueryExtension,
|
||||
|
@ -275,7 +275,7 @@ fi
|
|||
AM_CONDITIONAL(ENABLE_COMPOSITE, test "x$enable_composite" = "xyes")
|
||||
|
||||
AC_ARG_ENABLE(dbus,
|
||||
[ --enable-dbus compile with D-Bus support @<:@default=no@:>@],,
|
||||
[ --enable-dbus compile with D-Bus support (experimental) @<:@default=no@:>@],,
|
||||
enable_dbus=no)
|
||||
if test "x$enable_dbus" = "xyes"; then
|
||||
PKG_CHECK_MODULES(DBUS, dbus-1, AC_DEFINE(USE_DBUS, 1, [dbus support]), enable_dbus=no)
|
||||
|
@ -312,22 +312,7 @@ if test "x$enable_modules" = "xyes"; then
|
|||
fi
|
||||
AM_CONDITIONAL(BUILD_MODULES, test "x$enable_modules" = "xyes")
|
||||
|
||||
AC_ARG_ENABLE(gcc-cpp,
|
||||
[ --enable-gcc-cpp compile everything as if it were C++ @<:@default=no@:>@],,
|
||||
enable_gcc_cpp=no)
|
||||
if test "x$enable_gcc_cpp" = "xyes"; then
|
||||
CC="g++"
|
||||
CPPFLAGS="-x c++"
|
||||
fi
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
CFLAGS="$CFLAGS -W -Wall -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings"
|
||||
if test "x$enable_gcc_cpp" != "xyes"; then
|
||||
CFLAGS="$CFLAGS -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Set default visibility to hidden?
|
||||
dnl Set default visibility to hidden (only useful with --enable-modules)
|
||||
AC_ARG_ENABLE(visibility-hiding,
|
||||
[ --enable-visibility-hiding enable visibility hiding @<:@default=no@:>@],,
|
||||
enable_visibility_hiding=no
|
||||
|
@ -337,6 +322,21 @@ if test "x$enable_visibility_hiding" = xyes ; then
|
|||
CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(gcc-cpp,
|
||||
[ --enable-gcc-cpp compile everything as if it were C++ @<:@default=no@:>@],,
|
||||
enable_gcc_cpp=no)
|
||||
if test "x$enable_gcc_cpp" = "xyes"; then
|
||||
CC="g++"
|
||||
CPPFLAGS="$CPPFLAGS -x c++"
|
||||
fi
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
CFLAGS="$CFLAGS -W -Wall -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings"
|
||||
if test "x$enable_gcc_cpp" != "xyes"; then
|
||||
CFLAGS="$CFLAGS -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(E_X_LIBS)
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
@ -386,6 +386,7 @@ echo " RandR ........................ $enable_xrandr"
|
|||
echo " Sync ......................... $enable_xsync"
|
||||
echo " Composite .................... $enable_composite"
|
||||
echo " Modules ...................... $enable_modules"
|
||||
echo " Visibility hiding ............ $enable_visibility_hiding (only useful with modules)"
|
||||
echo " Window mode helper library ... $enable_roothacklib"
|
||||
echo
|
||||
echo "Experimental options - DO NOT USE unless you know what you are doing"
|
||||
|
|
Loading…
Reference in New Issue