Moved DEFAULT_UDUNITS2_XML_PATH out of makefile and into "config.h.in".

config.h.in

@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* The default absolute pathname of the installed units database */
+#undef DEFAULT_UDUNITS2_XML_PATH
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 

configure.ac

@@ -65,6 +65,15 @@ AC_ARG_ENABLE([udunits-1],
 CFLAGS=${CFLAGS:--O}
 CPPFLAGS=${CPPFLAGS:--DNDEBUG}
 
+# The default absolute pathname of the installed units database. "pkgdatadir"
+# isn't a configure-variable in the normal sense: it doesn't appear in 
+# "config.status" yet appears in "Makefile"; consequently, the following
+# nonsense just to avoid defining the pathname in the makefile so that Eclipse
+# is happy.
+pkgdatadir=$(eval echo $(eval echo `echo ${datadir}`/${PACKAGE}))
+AC_DEFINE_UNQUOTED([DEFAULT_UDUNITS2_XML_PATH], ["${pkgdatadir}/udunits2.xml"],
+    [The default absolute pathname of the installed units database])
+
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O

lib/Makefile.am

@@ -32,7 +32,6 @@ info_TEXINFOS 	= udunits2lib.texi
 #pdf_DATA = udunits2lib.pdf
 AM_MAKEINFOFLAGS = -I $(top_srcdir)
 AM_MAKEINFOHTMLFLAGS = --no-split -I $(top_srcdir)
-AM_CPPFLAGS    = -DDEFAULT_UDUNITS2_XML_PATH='"$(pkgdatadir)/udunits2.xml"'
 libudunits2_la_LDFLAGS	= -version-number 0:1:0
 
 lex_prefix = ut