[poppler] 3 commits - configure.ac glib/demo

[Albert Astals Cid]

 configure.ac         |    2 +-
 glib/demo/.gitignore |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit acf70c666d4f534cd97de64d4378bf6399e31fd4
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Dec 6 23:58:26 2007 +0100

    Disable gtk tests if the user disabled glib frontend

diff --git a/configure.ac b/configure.ac
index 547d6f0..0a2513a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,7 +267,7 @@ elif test x$enable_gtk_test = xtry; then
                     [enable_gtk_test="yes"],
                     [enable_gtk_test="no"])
 fi
-AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes)
+AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes -a x$enable_poppler_glib = xyes)
 
 AC_ARG_ENABLE(abiword-output,
               AC_HELP_STRING([--disable-abiword-output],
commit bb0ec68f21d355081ff75aad641bc3809141e398
Merge: 5a34cdd... b925ea2...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Dec 6 18:38:54 2007 +0100

    Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler

commit 5a34cddf043cb484549cb411e034786a7d8688a3
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Nov 23 23:13:57 2007 +0100

    add a ignore

diff --git a/glib/demo/.gitignore b/glib/demo/.gitignore
new file mode 100644
index 0000000..81c86d0
--- /dev/null
+++ b/glib/demo/.gitignore
@@ -0,0 +1 @@
+poppler-glib-demo