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

3 files changed, 13 insertions, 9 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
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ea364c4c1..9c1ebf5c6 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -7,6 +7,7 @@
 # Please note that the actual code is *not* freely available.
 
 PACKAGE = @PACKAGE@
+LIBNAME = @LIBNAME@
 VERSION = @VERSION@
 
 # These two variables depend on the location of this directory.
@@ -110,12 +111,12 @@ install-data-yes: all
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
-	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(LIBNAME).mo; \
+	    echo "installing $$cat as $(DESTDIR)$$dir/$(LIBNAME).mo"; \
 	  elif test -r $(srcdir)/$$cat; then \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(LIBNAME).mo; \
 	    echo "installing $(srcdir)/$$cat as" \
-		 "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
+		 "$(DESTDIR)$$dir/$(LIBNAME).mo"; \
 	  else \
 	    echo "WARNING: compiled message file $$cat is missing"; \
 	  fi; \
diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h.in
index a95168499..4586b3045 100644
--- a/src/xine-engine/xineintl.h
+++ b/src/xine-engine/xineintl.h.in
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineintl.h,v 1.7 2002/10/29 17:19:49 jkeil Exp $
+ * $Id: xineintl.h.in,v 1.1 2002/12/11 01:04:01 siggi Exp $
  *
  */
 
@@ -32,7 +32,7 @@ extern "C" {
 
 #ifdef ENABLE_NLS
 #    include <libintl.h>
-#    define _(String) dgettext ("xine-lib", String)
+#    define _(String) dgettext ("@LIBNAME@", String)
 #    ifdef gettext_noop
 #        define N_(String) gettext_noop (String)
 #    else