Enlightenment CVS committal

Author  : vapier
Project : e16
Module  : e

Dir     : e16/e


Modified Files:
        configure.in 


Log Message:
make xinerama a configure option and fix the configure help output
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- configure.in        27 Oct 2005 23:18:33 -0000      1.128
+++ configure.in        27 Nov 2005 17:54:56 -0000      1.129
@@ -73,19 +73,19 @@
 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 @@
 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 @@
 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 @@
 
 # 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_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"




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to