[Xfce4-commits] <tumbler:jeromeg/webkit-thumbnailer-rebased> Fix weird EOF in line 252 after merge.

[Jérôme Guelfucci]

Updating branch refs/heads/jeromeg/webkit-thumbnailer-rebased
         to 9792232913e8c9e8a5d83f08ff716b5bec3d8a1d (commit)
       from d7896db89c174edd3217395a84391890b1dc28d3 (commit)

commit 9792232913e8c9e8a5d83f08ff716b5bec3d8a1d
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 17 12:16:29 2013 +0100

    Fix weird EOF in line 252 after merge.

 acinclude.m4 |   49 ++++++++++++++++++++++++-------------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 93a5098..90a7fa5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -244,29 +244,6 @@ AC_MSG_RESULT([$ac_tumbler_raw_thumbnailer])
 
 
 
-dnl TUMBLER_COVER_THUMBNAILER()
-dnl
-dnl Check whether to build and install the Open Movie Database thumbnailer plugin.
-dnl
-AC_DEFUN([TUMBLER_COVER_THUMBNAILER],
-[
-AC_ARG_ENABLE([cover-thumbnailer], [AC_HELP_STRING([--disable-cover-thumbnailer], [Don't build the Cover thumbnailer plugin])],
-  [ac_tumbler_cover_thumbnailer=$enableval], [ac_tumbler_cover_thumbnailer=yes])
-if test x"$ac_tumbler_cover_thumbnailer" = x"yes"; then
-  dnl Check for gdk-pixbuf
-  PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14],
-  [
-    dnl Check for curl
-    PKG_CHECK_MODULES([CURL], [libcurl], [], [ac_tumbler_cover_thumbnailer=no])
-  ], [ac_tumbler_cover_thumbnailer=no])
-fi
-
-AC_MSG_CHECKING([whether to build the Cover thumbnailer plugin])
-AM_CONDITIONAL([TUMBLER_COVER_THUMBNAILER], [test x"$ac_tumbler_cover_thumbnailer" = x"yes"])
-AC_MSG_RESULT([$ac_tumbler_cover_thumbnailer])
-
-
-
 dnl TUMBLER_WEBKIT_THUMBNAILER()
 dnl
 dnl Check whether to build and install the Webkit HTML thumbnailer plugin.
@@ -291,6 +268,30 @@ AC_MSG_RESULT([$ac_tumbler_webkit_thumbnailer])
 
 
 
+dnl TUMBLER_COVER_THUMBNAILER()
+dnl
+dnl Check whether to build and install the Open Movie Database thumbnailer plugin.
+dnl
+AC_DEFUN([TUMBLER_COVER_THUMBNAILER],
+[
+AC_ARG_ENABLE([cover-thumbnailer], [AC_HELP_STRING([--disable-cover-thumbnailer], [Don't build the Cover thumbnailer plugin])],
+  [ac_tumbler_cover_thumbnailer=$enableval], [ac_tumbler_cover_thumbnailer=yes])
+if test x"$ac_tumbler_cover_thumbnailer" = x"yes"; then
+  dnl Check for gdk-pixbuf
+  PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14],
+  [
+    dnl Check for curl
+    PKG_CHECK_MODULES([CURL], [libcurl], [], [ac_tumbler_cover_thumbnailer=no])
+  ], [ac_tumbler_cover_thumbnailer=no])
+fi
+
+AC_MSG_CHECKING([whether to build the Cover thumbnailer plugin])
+AM_CONDITIONAL([TUMBLER_COVER_THUMBNAILER], [test x"$ac_tumbler_cover_thumbnailer" = x"yes"])
+AC_MSG_RESULT([$ac_tumbler_cover_thumbnailer])
+])
+
+
+
 dnl TUMBLER_XDG_CACHE()
 dnl
 dnl Check whether to build and install the freedesktop.org cache plugin.
@@ -320,5 +321,3 @@ AC_MSG_CHECKING([whether to build the freedesktop.org cache plugin])
 AM_CONDITIONAL([TUMBLER_XDG_CACHE], [test x"$ac_tumbler_xdg_cache" = x"yes"])
 AC_MSG_RESULT([$ac_tumbler_xdg_cache])
 ])
-
-