From c4d3c6409602743cc9c40f972fa37eae293283c5 Mon Sep 17 00:00:00 2001
From: Siggi Langauf <siggi@users.sourceforge.net>
Date: Wed, 11 Dec 2002 01:04:01 +0000
Subject: 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
---
 src/xine-engine/xineintl.h    | 57 -------------------------------------------
 src/xine-engine/xineintl.h.in | 57 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 src/xine-engine/xineintl.h
 create mode 100644 src/xine-engine/xineintl.h.in

(limited to 'src/xine-engine')

diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h
deleted file mode 100644
index a95168499..000000000
--- a/src/xine-engine/xineintl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2000-2002 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * 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 $
- *
- */
-
-#ifndef HAVE_XINEINTL_H
-#define HAVE_XINEINTL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <locale.h>
-
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    define _(String) dgettext ("xine-lib", String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
-#else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define ngettext(Singular, Plural, IsPlural) (Singular)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/xine-engine/xineintl.h.in b/src/xine-engine/xineintl.h.in
new file mode 100644
index 000000000..4586b3045
--- /dev/null
+++ b/src/xine-engine/xineintl.h.in
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2000-2002 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * 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.in,v 1.1 2002/12/11 01:04:01 siggi Exp $
+ *
+ */
+
+#ifndef HAVE_XINEINTL_H
+#define HAVE_XINEINTL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <locale.h>
+
+#ifdef ENABLE_NLS
+#    include <libintl.h>
+#    define _(String) dgettext ("@LIBNAME@", String)
+#    ifdef gettext_noop
+#        define N_(String) gettext_noop (String)
+#    else
+#        define N_(String) (String)
+#    endif
+#else
+/* Stubs that do something close enough.  */
+#    define textdomain(String) (String)
+#    define gettext(String) (String)
+#    define dgettext(Domain,Message) (Message)
+#    define dcgettext(Domain,Message,Type) (Message)
+#    define ngettext(Singular, Plural, IsPlural) (Singular)
+#    define bindtextdomain(Domain,Directory) (Domain)
+#    define _(String) (String)
+#    define N_(String) (String)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
-- 
cgit v1.2.3