[SCM] calf/master: + AutoHell: use a "proper" way of passing package lib directory

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5f201a56307bebdd31f4d6ffdf37a639a67939cb
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Nov 16 21:41:44 2008 +0000

    + AutoHell: use a "proper" way of passing package lib directory

diff --git a/config.h.in b/config.h.in
index 3ddb973..71b50c6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -78,6 +78,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Calf shared data directory (bitmaps, GUI XML etc.) */
+#undef PKGLIBDIR
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff --git a/configure.ac b/configure.ac
index 51a0903..75d814d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,8 @@ if test "$LV2_ENABLED" == "yes"; then
   AC_SUBST(with_lv2_dir)
 fi
 
+AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/lib/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
+
 # Checks for library functions.
 AC_CHECK_FUNCS([floor memset pow])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fbfb04..2cb6aa1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ if USE_LV2_GUI
 noinst_LTLIBRARIES += calflv2gui.la
 endif
 
-AM_CXXFLAGS = -ffast-math -finline-limit=80 -DPKGLIBDIR=\"$(pkglibdir)\"
+AM_CXXFLAGS = -ffast-math -finline-limit=80 
 
 if USE_GUI
 AM_CXXFLAGS += $(GUI_DEPS_CFLAGS)

-- 
calf audio plugins packaging