pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 configure.ac               |    1 +
 pixman-1-uninstalled.pc.in |   11 +++++++++++
 pixman/Makefile.am         |    2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit e21f00db50c30e80c8969fbf63982aeb7434dc1d
Author: Damien Carbery <damien.carbery at sun.com>
Date:   Wed Jul 16 15:47:38 2008 -0400

    Add pixman-1-uninstalled.pc file
    
    Signed-off-by: Søren Sandmann <sandmann at redhat.com>

diff --git a/configure.ac b/configure.ac
index 39add05..82632d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,7 @@ AC_SUBST(DEP_CFLAGS)
 AC_SUBST(DEP_LIBS)
 		  
 AC_OUTPUT([pixman-1.pc
+           pixman-1-uninstalled.pc
            Makefile
 	   pixman/Makefile
 	   pixman/pixman-version.h
diff --git a/pixman-1-uninstalled.pc.in b/pixman-1-uninstalled.pc.in
new file mode 100644
index 0000000..9a2afa1
--- /dev/null
+++ b/pixman-1-uninstalled.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Pixman
+Description: The pixman library (version 1)
+Version: @PACKAGE_VERSION@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/pixman
+Libs: ${pc_top_builddir}/${pcfiledir}/libpixman-1-so.a
+
commit 1570746350baf82d36aeb7ea1702350700b795d7
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Wed Jul 16 15:19:17 2008 -0400

    Use -no-undefined -- fixes bug 15927

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 68ba6d9..4f046f1 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libpixman-1.la
-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
 libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
 libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED
 libpixman_1_la_SOURCES =		\