diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-09 18:21:04 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-09 18:21:04 +0200 |
| commit | f36b9d822626dbbaf585e70cfa7ea60aa6d194af (patch) | |
| tree | 220b7a7d185f262dc793c14c92a77ea615950d86 /configure.ac | |
| parent | b6055c5fe61d918259d1c253aa32fa97dd3e5163 (diff) | |
| parent | d5d3776bf7e2733d382c5811b317bcdb7c2c9e88 (diff) | |
| download | xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.gz xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.bz2 | |
Merge with 1.2 branch.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c42e75c78..f4863ce40 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_INIT([xine-lib], XINE_VERSION_SPEC, [xine-bugs@lists.sourceforge.net]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/xine-engine/xine.c]) AC_CONFIG_LIBOBJ_DIR([lib]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([include/configure.h]) AM_MAINTAINER_MODE AH_TOP([#ifndef __XINE_LIB_CONFIG_H__ @@ -24,9 +24,6 @@ AH_BOTTOM([#ifdef ASMALIGN_1SLN # define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t" #endif -/* include internal system specific header */ -#include "os_internal.h" - #endif /* __XINE_LIB_CONFIG_H__ */ ]) @@ -74,7 +71,7 @@ AC_SUBST(XINE_LT_REVISION) XINE_LT_AGE=__XINE_LT_AGE AC_SUBST(XINE_LT_AGE) -LIBNAME="libxine${XINE_MAJOR}" +LIBNAME="libxine$(($XINE_LT_CURRENT-$XINE_LT_AGE))" AC_SUBST(LIBNAME) AC_DEFINE_UNQUOTED([XINE_TEXTDOMAIN], "$LIBNAME", [catalog message text domain]) |