[Xfce4-commits] <thunarx-python:master> Fixed python cflags/libs testing, improved modules checking

[Adam Plumb]

Updating branch refs/heads/master
         to 23c06d484de82658cb02cd83a4dfa8414ba74fc6 (commit)
       from 836f65471e23858dbdea16910d80b19e0ce9da13 (commit)

commit 23c06d484de82658cb02cd83a4dfa8414ba74fc6
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Fri Sep 18 08:39:02 2009 -0400

    Fixed python cflags/libs testing, improved modules checking

 configure.ac    |   22 +++++++++++-----------
 src/Makefile.am |    9 +++------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7273782..bd709e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,16 +14,19 @@ AC_PROG_LIBTOOL
 
 # Check for programs
 PKG_CHECK_MODULES([THUNARX], [thunarx-1 >= 0.4.0])
-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.6.0])
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0])
-PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.6.0])
 PKG_CHECK_MODULES([PYGTK], [pygtk-2.0 >= 2.8.0])
-PKG_CHECK_MODULES([PYTHON_GNOME], [gnome-python-2.0])
+PKG_CHECK_MODULES([GNOME], [
+    gobject-2.0 >= 2.6.0
+    gnome-vfs-2.0
+    gtk+-2.0 >= 2.6.0
+    glib-2.0 >= 2.6.0
+    gnome-python-2.0
+])
 
-PACKAGE_CFLAGS="-g -Wall $THUNARX_CFLAGS $PYGTK_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GOBJECT_CFLAGS $PYTHON_GNOME_CFLAGS"
-PACKAGE_LIBS="-g $THUNARX_LIBS $PYGTK_LIBS $GTK_LIBS $GLIB_LIBS $GOBJECT_LIBS $PYTHON_GNOME_LIBS"
-PACKAGE_LDFLAGS="$THUNARX_LDFLAGS $PYGTK_LDFLAGS $GTK_LDFLAGS $GLIB_LDFLAGS $GOBJECT_LDFLAGS $PYTHON_GNOME_LDFLAGS"
-PACKAGE_CPPFLAGS="$THUNARX_CPPFLAGS $PYGTK_CPPFLAGS $GTK_CPPFLAGS $GLIB_CPPFLAGS $GOBJECT_CPPFLAGS $PYTHON_GNOME_CPPFLAGS"
+PACKAGE_CFLAGS="-g -Wall $THUNARX_CFLAGS $PYGTK_CFLAGS $GNOME_CFLAGS `python-config --includes`"
+PACKAGE_LIBS="-g $THUNARX_LIBS $PYGTK_LIBS $GNOME_LIBS `python-config --ldflags`"
+PACKAGE_LDFLAGS="$THUNARX_LDFLAGS $PYGTK_LDFLAGS $GNOME_LDFLAGS"
+PACKAGE_CPPFLAGS="$THUNARX_CPPFLAGS $PYGTK_CPPFLAGS $GNOME_CPPFLAGS"
 
 # Make dependency CFLAGS and LIBS available
 AC_SUBST(PACKAGE_CFLAGS)
@@ -31,9 +34,6 @@ AC_SUBST(PACKAGE_LIBS)
 AC_SUBST(PACKAGE_LDFLAGS)
 AC_SUBST(PACKAGE_CPPFLAGS)
 
-PYTHON_CFLAGS="`python-config --includes`"
-PYTHON_LIBS="`python-config --ldflags`"
-
 AC_MSG_CHECKING(for pygtk defs)
 PYGTK_DEFSDIR=`pkg-config --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFSDIR)
diff --git a/src/Makefile.am b/src/Makefile.am
index c66f5a8..a0d375d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,7 @@ libthunarx_python_la_SOURCES = \
     thunarx_python.h
 
 libthunarx_python_la_LIBADD = \
-    $(PACKAGE_LIBS)         \
-    $(PYTHON_LIBS)
+    $(PACKAGE_LIBS)
  
 libthunarx_python_la_LDFLAGS = \
 	-avoid-version							\
@@ -22,8 +21,7 @@ libthunarx_python_la_CPPFLAGS = \
     $(PACKAGE_CPPFLAGS)
  
 libthunarx_python_la_CFLAGS = \
-    $(PACKAGE_CFLAGS)           \
-    $(PYTHON_CFLAGS)
+    $(PACKAGE_CFLAGS)
  
 pyexec_LTLIBRARIES = libthunarx.la
 pyexecdir = $(libdir)/thunarx-1/thunarx-python
@@ -37,8 +35,7 @@ libthunarx_la_LDFLAGS = \
     -module -avoid-version -export-symbols-regex initthunarx
 
 libthunarx_la_LIBADD = \
-    $(PACKAGE_LIBS) \
-    $(PYTHON_LIBS)
+    $(PACKAGE_LIBS)
     
 libthunarx_la_SOURCES = \
     thunarxmodule.c