diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-10-25 01:23:02 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-10-25 01:23:02 +0200 |
| commit | 1d978cea857a49710b28f6b906ee714ed6c5a492 (patch) | |
| tree | 1e55569c1479725beee2571b3c654b8c4650782b /configure.ac | |
| parent | b712e7b13dd6aed3e56eaee423ff071d6f0ce2c2 (diff) | |
| parent | ef0cc74567b3bb98378c17f6a523bf18ba132ed7 (diff) | |
Merge branch 'new-world-order'
Conflicts:
src/Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index f93903de..bd29f159 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.10 -Wall]) -AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR") +AC_SUBST(PA_MAJORMINOR, PA_MAJOR.PA_MINOR) +AC_SUBST(PA_MAJORMINORMICRO, PA_MAJOR.PA_MINOR.PA_MICRO) AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/]) AC_SUBST(PA_API_VERSION, 12) @@ -54,11 +55,6 @@ AC_SUBST(LIBPULSE_BROWSE_VERSION_INFO, [1:1:1]) # info x:y:z always will hold y=z AC_SUBST(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO, [0:4:0]) -# An internally used, ABI-unstable library that contains the -# PulseAudio core, SONAMEs are bumped on every release, version info -# suffix will always be 0:0 -AC_SUBST(LIBPULSECORE_VERSION_INFO, [8:0:0]) - AC_CANONICAL_HOST AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.]) @@ -1135,8 +1131,8 @@ fi AC_ARG_WITH( [module-dir], - AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]), - [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"]) + AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/]), + [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/"]) AC_SUBST(modlibexecdir) |