[Gnucash-changes] r12348 - gnucash/trunk - * configure.in: Properly set QOF_LIB_DIR et. al. for internal qof.

[Derek Atkins]

Author: warlord
Date: 2006-01-13 20:53:47 -0500 (Fri, 13 Jan 2006)
New Revision: 12348
Trac: http://svn.gnucash.org/trac/changeset/12348

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
Log:
	* configure.in: Properly set QOF_LIB_DIR et. al. for internal qof.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-13 23:57:36 UTC (rev 12347)
+++ gnucash/trunk/ChangeLog	2006-01-14 01:53:47 UTC (rev 12348)
@@ -14,6 +14,8 @@
 	* libgsf/*/Makefile.am:
 	  don't install goffice and gsf headers.
 
+	* configure.in: Properly set QOF_LIB_DIR et. al. for internal qof.
+
 2006-01-13  Neil Williams <linux at codehelp.co.uk>
 
 	* src/bin/test/test-version : Using Derek's fix to

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-01-13 23:57:36 UTC (rev 12347)
+++ gnucash/trunk/configure.in	2006-01-14 01:53:47 UTC (rev 12348)
@@ -451,14 +451,12 @@
   AC_MSG_NOTICE([External QOF Disabled.  Using Internal QOF Code.])
 fi
 if test x$QOF_XML_DIR = x; then
-	QOF_LIB_DIR=`eval echo $libdir | sed "s%^NONE%$prefix%"`
-	QOF_LIB_DIR=`eval echo $QOF_LIB_DIR | sed "s%^NONE%$prefix%"`  
-	QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof"
-	QOF_LIBS="\${top_srcdir}/lib/libqof/qof/libqof.la"
-#	QOF_LIB_DIR=`eval echo ${libdir}`
+	QOF_LIB_DIR='${libdir}'
+	QOF_CFLAGS='-I${top_srcdir}/lib/libqof/qof'
+	QOF_LIBS='${top_srcdir}/lib/libqof/qof/libqof.la'
 	QOF_VERSION="internal"
 	QOF_PREFIX="internal"
-	QOF_XML_DIR=`eval echo ${datadir}/xml/qsf`
+	QOF_XML_DIR='${datadir}/xml/qsf'
 	LIBQOF_LIBRARY_VERSION=1:2:0
 	LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:1:0
 	AC_SUBST(LIBQOF_LIBRARY_VERSION)