[Xfce4-commits] <thunarx-python:master> Setting AC_PREFIX_DEFAULT in an if/else block seems to cause problems, so just set the prefix variable. Also, print out build information

[Adam Plumb]

Updating branch refs/heads/master
         to b680df422d6d2f32267eedd50b67949e5171fb15 (commit)
       from 8bc31c1af4e39167e74425d17b2bc1427d1a6ec7 (commit)

commit b680df422d6d2f32267eedd50b67949e5171fb15
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Tue Jan 26 11:56:43 2010 -0500

    Setting AC_PREFIX_DEFAULT in an if/else block seems to cause problems, so just set the prefix variable.  Also, print out build information

 configure.ac.in |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 367f4fd..2c39520 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -72,11 +72,11 @@ 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])
+    prefix=`pkg-config --variable prefix thunarx-2`
+    XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.1.0])
 else
     THUNARX_API_VERSION=1
-    AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-1 || echo /usr)])
+    prefix=`pkg-config --variable prefix thunarx-1`
     XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.4.0])
 fi
 AC_SUBST(THUNARX_API_VERSION)
@@ -143,3 +143,12 @@ docs/Makefile
 docs/examples/Makefile
 ])
 
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+
+echo "Prefix: $prefix"
+echo