Skip ill formed lines

Summary:
Some lines reported by expedite are just informative, like the window
size. We skip lines that don't have the formatting we expect.

Fixes T8852

Reviewers: vtorri, raster

Reviewed By: raster

Maniphest Tasks: T8852

Differential Revision: https://phab.enlightenment.org/D12186

.arcconfig

@@ -0,0 +1,6 @@
+{
+  "project_id" : "expedite",
+  "projects" : "expedite",
+  "conduit_uri" : "https://phab.enlightenment.org/",
+  "phabricator.uri" : "https://phab.enlightenment.org/"
+}

.gitignore

@@ -0,0 +1,35 @@
+*~
+*.o
+*.swo
+*.swp
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+data/Makefile
+data/Makefile.in
+depcomp
+expedite.spec
+install-sh
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
+src/Makefile
+src/Makefile.in
+src/bin/.deps/
+src/bin/Makefile
+src/bin/Makefile.in
+src/bin/expedite
+stamp-h1

AUTHORS

@@ -3,3 +3,6 @@ Tim Horton <hortont424@gmail.com>
 Saumsung Electronics <tbd>
 Samsung SAIT <tbd>
 Bruno Tarquini <btarquini@gmail.com>
+Hermet Park <hermetpark@gmail.com>
+Eduardo Lima (Etrunko) <eblima@gmail.com>
+JaEun Choi <jaeun12.choi@samsung.com>

ChangeLog

@@ -0,0 +1,39 @@
+2011-12-02  Carsten Haitzler (The Rasterman)
+
+        * 1.1.0 release
+
+2012-04-26  Carsten Haitzler (The Rasterman)
+
+        * 1.2.0 release
+
+2012-05-02  Cedric Bail
+
+        * Do not allocate more than once Evas_Map.
+
+2012-08-30  Carsten Haitzler (The Rasterman)
+
+        * 1.7.0 release
+
+2012-10-24  Eduardo Lima (Etrunko)
+
+        * Remove support fox software_16_x11
+
+2012-11-01  Eduardo Lima (Etrunko)
+
+        * Added basic support for wayland engines
+
+2012-11-16  Eduardo Lima (Etrunko)
+
+        * Keyboard Support for Wayland EGL
+
+2012-11-21  Eduardo Lima (Etrunko)
+
+        * Keyboard Support for Wayland SHM
+
+2013-01-23  Yakov Goldberg
+
+        * Porting to Eo
+
+2013-02-18  Cedric Bail
+
+	* Test and benchmark lines.

INSTALL

@@ -1,14 +1,368 @@
-COMPILING and INSTALLING:
+Installation Instructions
+*************************
 
-If you got a official release tar archive do:
-    ./configure
-    
-( otherwise if you got this from enlightenment cvs do: ./autogen.sh )
-    
-Then to compile:
-    make
+   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
 
-To install (run this as root, or the user who handles installs):
-    make install
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
-NOTE: You MUST make install Expedite for it to run properly.
+Basic Installation
+==================
+
+   Briefly, the shell command './configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the 'README' file for
+instructions specific to this package.  Some packages provide this
+'INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The 'configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
+you can run in the future to recreate the current configuration, and a
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
+
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point 'config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
+
+     Running 'configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type 'make' to compile the package.
+
+  3. Optionally, type 'make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type 'make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the 'make install' phase executed with root
+     privileges.
+
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior 'make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type 'make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide 'make
+     distcheck', which can by used by developers to test that all other
+     targets like 'make install' and 'make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the 'configure' script does not know about.  Run './configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
+directory where you want the object files and executables to go and run
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
+
+   With a non-GNU 'make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use 'make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the 'lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to 'configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+'make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, 'make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated.  The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation.  However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+   Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System).  The
+'README' should mention any '--enable-' and '--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, 'configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of 'make' will be.  For these packages, running './configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with 'make V=1'; while running './configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with 'make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved.  Use GNU 'make' instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
+workaround.  If GNU CC is not installed, it is therefore recommended to
+try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
+
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features 'configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, 'configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+'--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option '--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with '--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to 'configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the 'configure' command line, using 'VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified 'gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation.  Until the limitation is lifted, you can use this
+workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+'configure' Invocation
+======================
+
+   'configure' recognizes the following options to control how it
+operates.
+
+'--help'
+'-h'
+     Print a summary of all of the options to 'configure', and exit.
+
+'--help=short'
+'--help=recursive'
+     Print a summary of the options unique to this package's
+     'configure', and exit.  The 'short' variant lists options used only
+     in the top level, while the 'recursive' variant lists options also
+     present in any nested packages.
+
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
+     script, and exit.
+
+'--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
+     disable caching.
+
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.
+
+'--quiet'
+'--silent'
+'-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to '/dev/null' (any error
+     messages will still be shown).
+
+'--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     'configure' can determine that directory automatically.
+
+'--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names:: for
+     more details, including other options available for fine-tuning the
+     installation locations.
+
+'--no-create'
+'-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+'configure' also accepts some other, not widely useful, options.  Run
+'configure --help' for more details.

NEWS

@@ -0,0 +1,36 @@
+Expedite 1.8.0
+
+Changes since Expedite 1.7.0:
+-----------------------------
+
+Additions:
+
+   * Support for Wayland engines
+   * Test and benchmark lines
+
+Removals:
+
+   * Evas software X11 16bpp engine suport
+
+Improvements:
+
+   * Porting to Eo
+
+Expedite 1.7.0
+
+Changes since Expedite 1.2.0:
+-----------------------------
+
+Improvements:
+
+   * Don't over allocate Evas_Map.
+
+Expedite 1.2.0
+
+Changes since Expedite 1.1.0:
+-----------------------------
+
+Removals:
+
+   * Evas SDL 16bpp engine suport
+   * Software_SDL engine (nos just use buffer engine)

README

@@ -1,4 +1,4 @@
-Expedite 1.0.0
+Expedite 1.7.99
 
 ******************************************************************************
 

configure.ac

@@ -3,248 +3,61 @@ dnl Process this file with autoconf to produce a configure script.
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT([expedite], [1.1.0], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([expedite], [1.23.0], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([1.6 dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PKG_PROG_PKG_CONFIG
 
 
-### Additional options to configure
-
-## Simple X11 build/link
-
-## Evas engines
-
-AC_ARG_ENABLE(simple-x11,
-   [AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking])],
-   [want_evas_simple_x11=$enableval]
-)
-
-# Software X11
-have_software_xlib="no"
-have_software_xcb="no"
-EXPEDITE_CHECK_ENGINE([software-x11], [Software X11], "yes")
-
-if test "x${have_software_x11}" = "xyes" ; then
-   have_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
-   if test "x${have_software_xlib}" = "xstatic" ; then
-      have_software_xlib="yes"
-   fi
-   if test "x${have_software_xlib}" = "xyes" ; then
-      AC_DEFINE(HAVE_EVAS_SOFTWARE_XLIB, 1, [Evas Software Xlib Engine Support])
-   fi
-   have_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
-   if test "x${have_software_xcb}" = "xstatic" ; then
-      have_software_xcb="yes"
-   fi
-   if test "x${have_software_xcb}" = "xyes" ; then
-      AC_DEFINE(HAVE_EVAS_SOFTWARE_XCB, 1, [Evas Software XCB Engine Support])
-   fi
-fi
-
-AM_CONDITIONAL([BUILD_SOFTWARE_XLIB], [test "x${have_software_xlib}" = "xyes"])
-AM_CONDITIONAL([BUILD_SOFTWARE_XCB], [test "x${have_software_xcb}" = "xyes"])
-
-# XRender X11
-EXPEDITE_CHECK_ENGINE([xrender-x11], [XRender X11], "yes")
-
-# OpenGL X11
-EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes")
-
-# XRender XCB
-EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes")
-
-# GDI
-EXPEDITE_CHECK_ENGINE([software-gdi], [Software GDI], "yes", [gdi_libs="-lgdi32"])
-AC_SUBST(gdi_libs)
-
-# DirectDraw
-EXPEDITE_CHECK_ENGINE([software-ddraw], [Software DirectDraw], "yes", [ddraw_libs="-lddraw -ldxguid -lgdi32"])
-AC_SUBST(ddraw_libs)
-
-# Direct3D
-EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"])
-AC_SUBST(d3d_libs)
-
-# Software SDL
-EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
-
-# PSL1GHT
-EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes")
-
-# GL SDL
-EXPEDITE_CHECK_ENGINE([opengl-sdl], [OpenGL SDL], "yes")
-
-# FB
-EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
-
-# DIRECTFB
-EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
-
-# GL Cocoa
-EXPEDITE_CHECK_ENGINE([opengl-cocoa], [OpenGL Cocoa], "yes", [gl_cocoa_libs="-framework Cocoa"])
-AC_SUBST(gl_cocoa_libs)
-
-# Software 16bit X11
-EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
-
-# 16bit DirectDraw
-EXPEDITE_CHECK_ENGINE([software-16-ddraw], [Software 16 bits DirectDraw], "yes", [ddraw_16_libs="-lddraw -ldxguid"])
-AC_SUBST(ddraw_16_libs)
-
-# 16bit WinCE
-EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
-AC_SUBST(wince_16_libs)
-
 ### Checks for programs
 
-AC_ISC_POSIX
-m4_ifdef([AC_PROG_OBJC],
-   [
-    AC_PROG_OBJC
-    _AM_DEPENDENCIES(OBJC)
-   ],
-   [
-    AC_CHECK_TOOL([OBJC], [gcc])
-    AC_SUBST([OBJC])
-    AC_SUBST([OBJCFLAGS])
-   ]
-)
-AC_PROG_CXX
 AC_PROG_CC
 
-LT_PROG_RC
-
-
-
 ### Checks for libraries
 
-# Evil library for compilation on Windows
+# EFL dependencies
+efl_version="1.23.0"
+requirement_expedite=" \
+eo >= ${efl_version} \
+efl >= ${efl_version} \
+eina >= ${efl_version} \
+evas >= ${efl_version} \
+eet >= ${efl_version} \
+ecore-evas >= ${efl_version} \
+ecore >= ${efl_version}"
 
-case "$host_os" in
-   mingw32ce*)
-      PKG_CHECK_MODULES([EVIL], [evil >= 1.0.0])
-      AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
-      ;;
-esac
+AC_SUBST(requirement_expedite)
 
-# Eina
-
-PKG_CHECK_MODULES([EINA], eina >= 1.1.0)
-
-# Evas
-
-PKG_CHECK_MODULES([EVAS], evas >= 1.1.0 eet >= 1.5.0)
-
-# Xlib
-
-if test "x$have_software_xlib" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then
-   AC_PATH_XTRA
-   AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],
-      [have_xlib="yes"],
-      [have_xlib="no"])
-   if test "x$want_evas_simple_x11" = "xyes"; then
-      x_libs="${x_libs} -lX11"
-   else
-      x_dir=${x_dir:-/usr/X11R6}
-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11"
-   fi
-fi
-AM_CONDITIONAL(BUILD_X11, [test "x$have_xlib" = "xyes"])
-
-AC_SUBST(x_cflags)
-AC_SUBST(x_libs)
-
-# XCB
-
-if test "x$have_software_xcb" = "xyes"; then
-   PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], [have_xcb="yes"], [have_xcb="no"])
-fi
-AM_CONDITIONAL(BUILD_XCB, test "x$have_xcb" = "xyes")
-if test "x$have_xcb" = "xyes"; then
-   AC_DEFINE(BUILD_XCB, 1, [build xcb support])
-fi
-
-# SDL
-
-if test "x$have_software_sdl" = "xyes" -o "x$have_gl_sdl" = "xyes"; then
-   PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
-fi
-AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes")
-
-# PSL1GHT
-AM_CONDITIONAL(BUILD_PSL1GHT, test "x$have_psl1ght" = "xyes")
-
-# DirectFB
-
-if test "x$have_directfb" = "xyes"; then
-   PKG_CHECK_MODULES([DIRECTFB], [directfb], [have_directfb="yes"], [have_directfb="no"])
-fi
-AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
+PKG_CHECK_MODULES([EFL], [${requirement_expedite}])
 
+EFL_ENABLE_EO_API_SUPPORT
+EFL_ENABLE_BETA_API_SUPPORT
 
 ### Checks for header files
 
-
 ### Checks for types
 
-
 ### Checks for structures
 
-
 ### Checks for compiler characteristics
 
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-AC_C_CONST
+AC_PROG_CC_C99
 AM_PROG_CC_C_O
 AC_C___ATTRIBUTE__
 
-WIN32_CFLAGS=""
-case "$host_os" in
-   cegcc*)
-      WIN32_CFLAGS="-mwin32"
-      ;;
-esac
-AC_SUBST(WIN32_CFLAGS)
-
-EXPEDITE_CXXFLAGS=""
-AC_LANG_PUSH([C++])
-CXXFLAGS_save="${CXXFLAGS}"
-CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions"
-AC_LINK_IFELSE(
-   [AC_LANG_PROGRAM([[]])],
-   [have_cxx_flags="yes"],
-   [have_cxx_flags="no"])
-AC_MSG_CHECKING([whether the compiler supports -fno-rtti -fno-exceptions])
-AC_MSG_RESULT([${have_cxx_flags}])
-CXXFLAGS="${CXXFLAGS_save}"
-if test "x${have_cxx_flags}" = "xyes" ; then
-   EXPEDITE_CXXFLAGS="-fno-rtti -fno-exceptions"
+if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
+   AC_MSG_ERROR([expedite requires a c99-capable compiler])
 fi
-AC_LANG_POP([C++])
-AC_SUBST(EXPEDITE_CXXFLAGS)
-
 
 ### Checks for linker characteristics
 
-lt_enable_auto_import=""
-case "$host_os" in
-   mingw* | cegcc*)
-      lt_enable_auto_import="-Wl,--enable-auto-import"
-      ;;
-esac
-AC_SUBST(lt_enable_auto_import)
-
-
 ### Checks for library functions
 
 AC_CHECK_FUNCS([sync])
@@ -252,6 +65,7 @@ AC_CHECK_FUNCS([sync])
 
 AC_OUTPUT([
 Makefile
+expedite.spec
 src/Makefile
 src/bin/Makefile
 data/Makefile
@@ -260,24 +74,6 @@ data/Makefile
 echo
 echo "  $PACKAGE $VERSION"
 echo
-echo "  Engines:"
-echo "    Software X11.................: ${have_software_x11} (Xlib: ${have_software_xlib}) (XCB: ${have_software_xcb})"
-echo "    X Render X11.................: ${have_xrender_x11}"
-echo "    Open GL X11..................: ${have_opengl_x11}"
-echo "    X Render XCB.................: ${have_xrender_xcb}"
-echo "    Software GDI.................: ${have_software_gdi}"
-echo "    Software DirectDraw..........: ${have_software_ddraw}"
-echo "    Direct3D.....................: ${have_direct3d}"
-echo "    Software SDL.................: ${have_software_sdl}"
-echo "    Open GL SDL..................: ${have_opengl_sdl}"
-echo "    Open GL Cocoa................: ${have_opengl_cocoa}"
-echo "    FB...........................: ${have_fb}"
-echo "    DirectFB.....................: ${have_directfb}"
-echo "    PSL1GHT......................: ${have_psl1ght}"
-echo "    Software X11 16 bits.........: ${have_software_16_x11}"
-echo "    Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
-echo "    Software WinCE 16 bits.......: ${have_software_16_wince}"
-echo
 echo "  Installation:"
 echo "    prefix.......................: ${prefix}"
 echo

data/Makefile.am

@@ -55,6 +55,7 @@ data.png \
 widgets.png \
 e-logo-2.png \
 e-logo-