e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

make xinerama a configure option and fix the configure help output 

SVN revision: 18668
This commit is contained in:
Mike Frysinger 2005-11-27 17:54:56 +00:00
parent 64e15839e7
commit 09096fe116
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@ -73,19 +73,19 @@ if test "x$LIBINTL" = "x"; then
fi
AC_ARG_ENABLE(fsstd,
[ --enable-fsstd install files following FSSTD [default=yes]],,
[ --enable-fsstd install files following FSSTD @<:@default=yes@:>@],,
enable_fsstd=yes)
AC_ARG_ENABLE(sound,
[ --enable-sound compile with sound support [default=yes]],,
[ --enable-sound compile with sound support @<:@default=yes@:>@],,
enable_sound=yes)
AC_ARG_ENABLE(hints-gnome,
[ --enable-hints-gnome compile with GNOME(<2.0) hints support [default=no]],,
[ --enable-hints-gnome compile with GNOME(<2.0) hints support @<:@default=no@:>@],,
enable_hints_gnome=no)
AC_ARG_ENABLE(ecore-x,
[ --enable-ecore-x use ecore-x interface to X11 [default=no]],,
[ --enable-ecore-x use ecore-x interface to X11 @<:@default=no@:>@],,
enable_ecore_x=no)
if test "x$enable_hints_gnome" = "xyes"; then
@ -155,13 +155,17 @@ fi
AC_CHECK_LIB(Xext, XShapeQueryExtension,
E_X_LIBS="-lXext $E_X_LIBS", , $X_LIBS -lX11)
AC_ARG_ENABLE(xinerama,
[ --enable-xinerama compile with xinerama support @<:@default=yes@:>@],,
enable_xinerama=yes)
if test "x$enable_xinerama" = "xyes"; then
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
XINERAMA_LIBS="-lXinerama", , $X_LIBS -lXext -lX11)
AC_SUBST(XINERAMA_LIBS)
E_X_LIBS="-lXinerama $E_X_LIBS", , $X_LIBS -lXext -lX11)
fi
AC_ARG_ENABLE(zoom,
[ --enable-zoom compile with zoom support [default=yes]],,
[ --enable-zoom compile with zoom support @<:@default=yes@:>@],,
enable_zoom=yes)
if test "x$enable_zoom" = "xyes"; then
AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
@ -172,7 +176,7 @@ else
fi
AC_ARG_ENABLE(xrandr,
[ --enable-xrandr compile with RandR support [default=yes]],,
[ --enable-xrandr compile with RandR support @<:@default=yes@:>@],,
enable_xrandr=yes)
if test "x$enable_xrandr" = "xyes"; then
AC_CHECK_LIB(Xrandr, XRRQueryExtension,
@ -183,7 +187,7 @@ fi
# FIXME - Do this properly
AC_ARG_ENABLE(composite,
[ --enable-composite compile with Composite support [default=yes]],,
[ --enable-composite compile with Composite support @<:@default=yes@:>@],,
enable_composite=yes)
if test "x$enable_composite" = "xyes"; then
AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,
@ -204,7 +208,7 @@ AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale,, [
])
AC_ARG_ENABLE(gcc-warnings,
[ --enable-gcc-warnings enable GCC compiler warnings [default=no]],,
[ --enable-gcc-warnings enable GCC compiler warnings @<:@default=no@:>@],,
enable_gcc_warnings=no)
if test "x$enable_gcc_warnings" = "xyes"; then
CFLAGS="$CFLAGS -W -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings #-Wunreachable-code"

2
dox/Makefile.am
View File

@ -6,7 +6,7 @@ bin_PROGRAMS = edox
edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
LDADD = $(IMLIB_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
LDADD = $(IMLIB_LIBS) $(X_LIBS) $(E_X_LIBS) -lX11 -lm
INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(IMLIB_CFLAGS) $(X_CFLAGS)