diff options
| author | Siggi Langauf <siggi@users.sourceforge.net> | 2002-12-11 01:04:01 +0000 |
|---|---|---|
| committer | Siggi Langauf <siggi@users.sourceforge.net> | 2002-12-11 01:04:01 +0000 |
| commit | c4d3c6409602743cc9c40f972fa37eae293283c5 (patch) | |
| tree | 76c1fa28835584def61d332784b270142208dbed /configure.ac | |
| parent | 1e80044eedd60d6521235c2bfe865e1956cb9cb8 (diff) | |
| download | xine-lib-c4d3c6409602743cc9c40f972fa37eae293283c5.tar.gz xine-lib-c4d3c6409602743cc9c40f972fa37eae293283c5.tar.bz2 | |
Avoiding filesystem clashes with libxine0 (0.9.13)
=> you can install xine-lib 0.9.13, gnome-xine 0.1, xine-lib 1-beta*,
xine-ui 0.9.15 in that order and both applications will work
=> distributions can have libxine0 and libxine1 binary packages (not the
-dev/-devel) packages installed inparallel for a smooth upgrade path
I can't get rid of the feeling that I have broken something here...
CVS patchset: 3479
CVS date: 2002/12/11 01:04:01
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4f25b2b03..d9778669a 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,9 @@ SPEC_VERSION=${XINE_MAJOR}_$XINE_PRE AC_SUBST(TAR_NAME) AC_SUBST(SPEC_VERSION) +LIBNAME=libxine$XINE_MAJOR +AC_SUBST(LIBNAME) + dnl AC_CANONICAL_TARGET @@ -1029,8 +1032,7 @@ eval XINE_PLUGINPATH=`eval echo "$XINE_PLUGINDIR"` AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINPATH",[Define this to plugins directory location]) AC_SUBST(XINE_PLUGINPATH) - -XINE_FONTDIR="${datadir}/xine/fonts" +XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts" eval XINE_FONTPATH="$XINE_FONTDIR" AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location]) AC_SUBST(XINE_FONTPATH) @@ -1177,7 +1179,8 @@ src/video_out/libdha/sysdep/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile -src/xine-engine/Makefile]) +src/xine-engine/Makefile +src/xine-engine/xineintl.h]) AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) AC_OUTPUT |