[gnome-contacts: 13/13] Merge latest egg-list-box

[Alexander Larsson <alexl src gnome org>]

commit 2dc9d06b01e4ce6d11f6b2f1f58fcfbdc17a8413
Merge: e4b150a eb56153
Author: Alexander Larsson <alexl redhat com>
Date:   Mon May 21 21:07:35 2012 +0200

    Merge latest egg-list-box

 src/listbox/.gitignore                     |    6 +++
 src/listbox/Makefile.am                    |   38 ++++++++++++++++++--
 src/listbox/autogen.sh                     |   16 ++++++++-
 src/listbox/configure.ac                   |    2 +-
 src/listbox/egg-list-box-uninstalled.pc.in |   12 ++++++
 src/listbox/egg-list-box.vala              |   53 ++++++++++++++++++++-------
 src/listbox/test-scrolled.vala             |    9 ++++-
 7 files changed, 115 insertions(+), 21 deletions(-)
---
diff --cc src/listbox/.gitignore
index fa9e249,0000000..b1d8b60
mode 100644,000000..100644
--- a/src/listbox/.gitignore
+++ b/src/listbox/.gitignore
@@@ -1,43 -1,0 +1,49 @@@
 +*.bak
 +*.lo
 +*.o
 +*.orig
 +*.rej
 +*.tab.c
 +*~
 +.deps
 +.libs
 +Makefile
 +Makefile.in
 +/aclocal.m4
 +/autom4te.cache
 +/autoscan.log
 +/compile
 +/config.cache
 +/config.guess
 +/config.h
 +/config.h.in
 +/config.log
 +/config.lt
 +/config.status
 +/config.status.lineno
 +/config.sub
 +/configure
 +/configure.lineno
 +/configure.scan
 +/ltmain.sh
 +/depcomp
 +/install-sh
 +/intltool-extract
 +/intltool-extract.in
 +/intltool-merge
 +/intltool-merge.in
 +/intltool-update
 +/intltool-update.in
 +/libtool
 +/missing
 +/m4
 +/stamp-h1
 +*.stamp
 +*.c
 +test-list
++test-scrolled
++/egg-list-box-uninstalled.pc
++/egg-list-box.h
++/egglistbox.vapi
++/omf.make
++/xmldocs.make
diff --cc src/listbox/Makefile.am
index f2770ef,0000000..fc60072
mode 100644,000000..100644
--- a/src/listbox/Makefile.am
+++ b/src/listbox/Makefile.am
@@@ -1,31 -1,0 +1,61 @@@
 +NULL =
 +
 +AM_CPPFLAGS = \
 +	-include config.h \
 +	$(LISTBOX_CFLAGS) \
 +	$(NULL)
 +
 +AM_VALAFLAGS = \
 +	@LISTBOX_PACKAGES@ \
++	--vapidir=. \
 +	$(NULL)
 +
++noinst_LTLIBRARIES = libegglistbox.la
++
++libegglistbox_la_VALAFLAGS = \
++	$(AM_VALAFLAGS) \
++	--library=egglistbox \
++	--vapi egglistbox.vapi \
++	-H egg-list-box.h \
++	$(NULL)
++libegglistbox_la_SOURCES = egg-list-box.vala
++libegglistbox_la_LIBADD = $(LISTBOX_LIBS)
++
 +noinst_PROGRAMS = test-list test-scrolled
 +
 +test_list_SOURCES = \
- 	egg-list-box.vala \
 +	test-list.vala \
 +	$(NULL)
- test_list_LDADD = $(LISTBOX_LIBS)
++
++test_list_LDADD = \
++	$(LISTBOX_LIBS) \
++	libegglistbox.la \
++	$(NULL)
++
++test_list_VALAFLAGS = \
++	$(AM_VALAFLAGS) \
++	--pkg egglistbox \
++	$(NULL)
 +
 +test_scrolled_SOURCES = \
- 	egg-list-box.vala \
 +	test-scrolled.vala \
 +	$(NULL)
- test_scrolled_LDADD = $(LISTBOX_LIBS)
++
++test_scrolled_LDADD = \
++	$(LISTBOX_LIBS) \
++	libegglistbox.la \
++	$(NULL)
++
++test_scrolled_VALAFLAGS = \
++	$(AM_VALAFLAGS) \
++	--pkg egglistbox \
++	$(NULL)
 +
 +CLEANFILES = \
 +	$(test_list_SOURCES:.vala=.c) \
++	$(test_scrolled_SOURCES:.vala=.c) \
++	$(libegglistbox_la_SOURCES:.vala=.c) \
 +	*.vapi *.stamp
 +
 +EXTRA_DIST = \
 +	$(NULL)
diff --cc src/listbox/autogen.sh
index e48ee08,0000000..a31a9ab
mode 100755,000000..100755
--- a/src/listbox/autogen.sh
+++ b/src/listbox/autogen.sh
@@@ -1,4 -1,0 +1,18 @@@
 +#!/bin/sh
 +mkdir -p m4
 +autoreconf -fiv -Wall || exit
- ./configure --enable-maintainer-mode "$@"
++
++run_configure=true
++for arg in $*; do
++    case $arg in
++        --no-configure)
++            run_configure=false
++            ;;
++        *)
++            ;;
++    esac
++done
++
++if test $run_configure = true; then
++    ./configure --enable-maintainer-mode "$@"
++fi
diff --cc src/listbox/configure.ac
index edd2169,0000000..3eae7dc
mode 100644,000000..100644
--- a/src/listbox/configure.ac
+++ b/src/listbox/configure.ac
@@@ -1,25 -1,0 +1,25 @@@
 +AC_PREREQ([2.67])
 +AC_INIT([egg-list-box],[3.5.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-contacts])
 +AC_CONFIG_SRCDIR([test-list.vala])
 +AC_CONFIG_HEADERS([config.h])
 +AC_CONFIG_MACRO_DIR([m4])
 +AM_INIT_AUTOMAKE
 +# Enable silent rules is available
 +AM_SILENT_RULES([yes])
 +AM_MAINTAINER_MODE([enable])
 +AC_CONFIG_FILES([Makefile
 +		])
 +
 +LT_INIT
 +AC_PROG_CC
 +AM_PROG_VALAC([0.16.0])
 +AC_PROG_INSTALL
 +
 +pkg_modules="gtk+-3.0 >= 3.4.0
 +	     glib-2.0 >= 2.31.10"
 +PKG_CHECK_MODULES(LISTBOX, [$pkg_modules])
 +
 +LISTBOX_PACKAGES="--pkg gtk+-3.0"
 +AC_SUBST(LISTBOX_PACKAGES)
 +
- AC_OUTPUT
++AC_OUTPUT( egg-list-box-uninstalled.pc )
diff --cc src/listbox/egg-list-box-uninstalled.pc.in
index 0000000,ab61b4d..ab61b4d
mode 000000,100644..100644
--- a/src/listbox/egg-list-box-uninstalled.pc.in
+++ b/src/listbox/egg-list-box-uninstalled.pc.in