[cogl/wip/public-atlas-apis: 7/13] eglib: remove some redundant files

[Robert Bragg <rbragg src gnome org>]

commit 6c775c9ed2ba46e8ebf0338f5170afbba3667269
Author: Robert Bragg <robert linux intel com>
Date:   Sun Feb 9 14:48:56 2014 +0000

    eglib: remove some redundant files
    
    The eglib as found in the mono git repository can be built separately
    from the rest of mono, but to avoid maintaining parallel build scripts
    for eglib this strips away the autotool related files from deps/eglib.

 configure.ac                |    1 -
 deps/eglib/COPYING          |   17 -
 deps/eglib/ChangeLog        |    7 -
 deps/eglib/Makefile.am      |   12 +-
 deps/eglib/TODO             |   33 --
 deps/eglib/acinclude.m4     |  182 ----------
 deps/eglib/autogen.sh       |  136 --------
 deps/eglib/config.rpath     |  672 -------------------------------------
 deps/eglib/configure.ac     |  268 ---------------
 deps/eglib/m4/.gitignore    |    7 -
 deps/eglib/m4/Makefile.am   |    1 -
 deps/eglib/m4/iconv.m4      |  214 ------------
 deps/eglib/m4/lib-ld.m4     |  110 ------
 deps/eglib/m4/lib-link.m4   |  774 -------------------------------------------
 deps/eglib/m4/lib-prefix.m4 |  224 -------------
 deps/eglib/src/gquark.c     |    3 +-
 16 files changed, 7 insertions(+), 2654 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b2e2ed7..af50a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1631,7 +1631,6 @@ build/win32/vs9/Makefile
 build/win32/vs10/Makefile
 deps/Makefile
 deps/eglib/Makefile
-deps/eglib/m4/Makefile
 deps/eglib/src/Makefile
 deps/eglib/src/eglib-config.h
 deps/eglib/test/Makefile
diff --git a/deps/eglib/Makefile.am b/deps/eglib/Makefile.am
index b7e5cd6..b5ec149 100644
--- a/deps/eglib/Makefile.am
+++ b/deps/eglib/Makefile.am
@@ -1,17 +1,15 @@
-ACLOCAL_AMFLAGS = -I m4
-
 if HOST_WIN32
-SUBDIRS = m4 src
+SUBDIRS = src
 else
 if PLATFORM_DARWIN
-SUBDIRS = m4 src
+SUBDIRS = src
 else
 if CROSS_COMPILING
-SUBDIRS = m4 src
+SUBDIRS = src
 else
-SUBDIRS = m4 src test
+SUBDIRS = src test
 endif
 endif
 endif
 
-EXTRA_DIST = autogen.sh README NEWS AUTHORS ChangeLog winconfig.h
+EXTRA_DIST = README winconfig.h
diff --git a/deps/eglib/src/gquark.c b/deps/eglib/src/gquark.c
index cb1a95d..92a715b 100644
--- a/deps/eglib/src/gquark.c
+++ b/deps/eglib/src/gquark.c
@@ -49,7 +49,8 @@ g_quark_from_static_string (const gchar *string)
     {
       GQuark new_quark = _next_quark++;
       g_hash_table_insert (_quark_hash_table,
-                           GUINT_TO_POINTER (new_quark), (gpointer)string);
+                           (gpointer)string,
+                           GUINT_TO_POINTER (new_quark));
       return new_quark;
     }
   else