[beast: 14/39] fix configure.ac

[Tim Janik <timj src gnome org>]

commit ee3c26643b24983d3287e357a7de1471f690a91e
Author: Tim Janik <timj gnu org>
Date:   Fri Sep 11 23:59:58 2015 +0200

    fix configure.ac

 configure.ac |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3b23755..4458a17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,14 +74,14 @@ AC_SUBST(pkgdocdir)
 bak_prefix="$prefix" ; bak_exec_prefix="$exec_prefix" ; bak_libdir="$libdir" ; 
bak_datarootdir="$datarootdir" ; bak_datadir="$datadir"
 test "x$prefix" = xNONE && prefix="$ac_default_prefix" ; test "x$exec_prefix" = xNONE && 
exec_prefix="$prefix"
 libdir=`eval echo "${libdir}"` ; datarootdir=`eval echo "${datarootdir}"` ; datadir=`eval echo "${datadir}"`
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_INCLUDES, ["`eval echo "${includedir}"`"], [Base directory for standard 
include files])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_BINDIR, ["`eval echo "${bindir}"`"], [Directory to install and execute 
programs])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"], [Base directory for locale 
specific message catalogs])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA plugins])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_PKGLIBDIR, ["`eval echo ${pkglibdir}`"], [Directory to install plugins 
and drivers])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_PKGDATADIR, ["`eval echo ${pkgdatadir}`"], [Directory to install samples, 
effects, scripts, etc])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_PKGDOCDIR, ["`eval echo ${pkgdocdir}`"], [Directory to install 
documentation])
-AC_DEFINE_UNQUOTED(BSE_INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
+AC_DEFINE_UNQUOTED(INSTALLPATH_INCLUDES, ["`eval echo "${includedir}"`"], [Base directory for standard 
include files])
+AC_DEFINE_UNQUOTED(INSTALLPATH_BINDIR, ["`eval echo "${bindir}"`"], [Directory to install and execute 
programs])
+AC_DEFINE_UNQUOTED(INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"], [Base directory for locale specific 
message catalogs])
+AC_DEFINE_UNQUOTED(INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA plugins])
+AC_DEFINE_UNQUOTED(INSTALLPATH_PKGLIBDIR, ["`eval echo ${pkglibdir}`"], [Directory to install plugins and 
drivers])
+AC_DEFINE_UNQUOTED(INSTALLPATH_PKGDATADIR, ["`eval echo ${pkgdatadir}`"], [Directory to install samples, 
effects, scripts, etc])
+AC_DEFINE_UNQUOTED(INSTALLPATH_PKGDOCDIR, ["`eval echo ${pkgdocdir}`"], [Directory to install documentation])
+AC_DEFINE_UNQUOTED(INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
 prefix="$bak_prefix" ; exec_prefix="$bak_exec_prefix" ; libdir="$bak_libdir" ; 
datarootdir="$bak_datarootdir" ; datadir="$bak_datadir"
 
 # Build tree checks
@@ -338,10 +338,6 @@ AC_DEFUN([AC_SFI_REQUIREMENTS],
 
     AC_CHECK_FUNCS(getpwnam_r getpwnam)
     AC_CHECK_FUNCS(timegm)
-
-    dnl # --- SFI directories ---
-    sfidlstdincdir=${includedir}
-    AC_SUBST(sfidlstdincdir)
 ])
 AC_DEFUN([AC_BSE_REQUIREMENTS],
 [