[Xfce4-commits] <thunarx-python:master> Reverted back to only working with thunarx-2, since there are some fileinfo methods that require GIO

[Adam Plumb]

Updating branch refs/heads/master
         to 064b658adbf94ce19bd342159b3b4adb1c2f54d7 (commit)
       from 532176824c7d51a85be79f220227ffa518a51815 (commit)

commit 064b658adbf94ce19bd342159b3b4adb1c2f54d7
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Thu Jan 14 08:43:37 2010 -0500

    Reverted back to only working with thunarx-2, since there are some fileinfo methods that require GIO

 configure.ac.in |   21 ++++-----------------
 src/Makefile.am |    2 +-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index ae21ef7..138d0cc 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -29,6 +29,7 @@ dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-2 || echo /usr)])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
 
@@ -69,21 +70,7 @@ AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR(could not find Python lib)])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-
-dnl ***************************
-dnl *** Determine the installed thunarx version ***
-dnl ***************************
-if test "`pkg-config --variable prefix thunarx-2`" != ""; then
-    THUNARX_API_VERSION=2
-    AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-2 || echo /usr)])
-    XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
-else
-    THUNARX_API_VERSION=1
-    AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-1 || echo /usr)])
-    XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.4.0])
-fi
-AC_SUBST(THUNARX_API_VERSION)
-
+XDT_CHECK_PACKAGE([THUNARX], [thunarx-2])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
@@ -98,7 +85,7 @@ AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_LIBS)
 AC_SUBST(PYTHON_LDFLAGS)
 
-THUNARX_LIBDIR=`pkg-config --variable=libdir thunarx-${THUNARX_API_VERSION}`
+THUNARX_LIBDIR=`pkg-config --variable=libdir thunarx-2`
 AC_SUBST(THUNARX_LIBDIR)
 AC_DEFINE_UNQUOTED(THUNARX_LIBDIR, "$THUNARX_LIBDIR", [Thunarx libdir])
 
@@ -120,7 +107,7 @@ AC_MSG_RESULT($PYGTK_CODEGEN)
 dnl ---------------------------------
 dnl Get thunar extensions directory
 dnl ---------------------------------
-THUNARX_EXTENSION_DIR=`$PKG_CONFIG --variable=extensionsdir thunarx-${THUNARX_API_VERSION}`
+THUNARX_EXTENSION_DIR=`$PKG_CONFIG --variable=extensionsdir thunarx-2`
 AC_SUBST(THUNARX_EXTENSION_DIR)
 AC_DEFINE_UNQUOTED(THUNARX_EXTENSION_DIR, "$THUNARX_EXTENSION_DIR", [Thunar's extensions directory])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a794397..ec2e10f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS =								\
 	-DPY_LIB_LOC=\"$(PYTHON_LIB_LOC)\"				\
 	-DPYTHON_VERSION=\"$(PYTHON_VERSION)\"
 
-extensionsdir = $(THUNARX_LIBDIR)/thunarx- at THUNARX_API_VERSION@
+extensionsdir = $(THUNARX_LIBDIR)/thunarx-2
 extensions_LTLIBRARIES =						\
 	thunarx-python.la