[libgssh] Use standalone libgsystem

[Colin Walters <walters src gnome org>]

commit b400b85d167c940917d83e105b8e68837bfcad57
Author: Colin Walters <walters verbum org>
Date:   Thu Feb 6 04:37:49 2014 -0500

    Use standalone libgsystem
    
    Rather than having our own copies of localalloc.

 Makefile.am                                        |    7 +-
 configure.ac                                       |    2 +-
 .../Makefile-gsystem-local-alloc.am                |   27 ----
 libgsystem-local-alloc/gsystem-local-alloc.c       |   72 ---------
 libgsystem-local-alloc/gsystem-local-alloc.h       |  164 --------------------
 5 files changed, 3 insertions(+), 269 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 243d863..3ccc0b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,6 @@
 
 include Makefile-decls.am
 
-libgsystem_srcdir := $(srcdir)/libgsystem-local-alloc
-include libgsystem-local-alloc/Makefile-gsystem-local-alloc.am
-
 LIBGSSH_LIBRARY_MAJOR = 1
 
 pkgconfig_DATA += libgssh-1.pc
@@ -38,9 +35,9 @@ libgssh_1_la_SOURCES = \
        src/gssh-channel-output-stream.c \
        $(NULL)
 
-libgssh_1_la_CFLAGS = $(AM_CFLAGS) $(BUILDDEP_LIBGSSH_CFLAGS) -I$(srcdir)/src -I$(libgsystem_srcdir)
+libgssh_1_la_CFLAGS = $(AM_CFLAGS) $(BUILDDEP_LIBGSSH_CFLAGS) -I$(srcdir)/src
 libgssh_1_la_LDFLAGS = -version-number $(LIBGSSH_LIBRARY_MAJOR):0:0 -Bsymbolic-functions 
-export-symbols-regexp '^gssh_' -no-undefined -export-dynamic
-libgssh_1_la_LIBADD = $(BUILDDEP_LIBGSSH_LIBS) libgsystem-local-alloc.la
+libgssh_1_la_LIBADD = $(BUILDDEP_LIBGSSH_LIBS)
 
 gssh-enum-types.h: $(libgssh_HEADERS) src/gssh-enum-types.h.template
        $(AM_V_GEN) glib-mkenums --identifier-prefix GSsh --symbol-prefix gssh --template $(filter 
%.template,$^) $(filter-out %.template,$^) > \
diff --git a/configure.ac b/configure.ac
index b0a0537..8feed96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ PKG_PROG_PKG_CONFIG
 GLIB_GSETTINGS
 
 PKG_CHECK_MODULES(BUILDDEP_GIO_UNIX, [gio-unix-2.0 >= 2.34])
-PKG_CHECK_MODULES(BUILDDEP_LIBGSSH, [gio-unix-2.0 libssh])
+PKG_CHECK_MODULES(BUILDDEP_LIBGSSH, [gio-unix-2.0 libssh libgsystem])
 save_LIBS=$LIBS
 LIBS=$BUILDDEP_LIBGSSH_LIBS
 AC_CHECK_FUNC(ssh_get_poll_flags,,AC_MSG_ERROR([You must have libssh 0.6 with ssh_get_poll_flags]))