# HG changeset patch
# User Albert Lee <[EMAIL PROTECTED]>
# Date 1172020870 18000
# Node ID b46dbeddbf9393177dd8eab867efbfd9bb091553
# Parent 5ddc08605e8b708fab1e8913b78a9053c7bcf825
Solaris 10/Solaris Express build fixes.
diff -r b46dbeddbf9393177dd8eab867efbfd9bb091553 -r
5ddc08605e8b708fab1e8913b78a9053c7bcf825 configure.ac
--- a/configure.ac Tue Feb 20 20:21:10 2007 -0500
+++ b/configure.ac Tue Feb 20 18:57:56 2007 +0000
@@ -74,6 +74,16 @@ dnl Checks for X11
dnl Checks for X11
dnl ---------------------------------------------
AC_PATH_XTRA
+
+dnl ---------------------------------------------
+dnl socket library
+dnl ---------------------------------------------
+
+dnl Test for socket and network support library
+NET_LIBS=""
+AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)
+AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
+AC_SUBST(NET_LIBS)
dnl ---------------------------------------------
dnl Check for libsmjs (spidermonkey)
@@ -291,7 +301,7 @@ dnl Extract xine-lib's text domain name
dnl Extract xine-lib's text domain name
LIB_PACKAGE="libxine`echo '#define ENABLE_NLS
#include <xine/xine_internal.h>
- XINE_MAJOR_VERSION' | $CPP $CPPFLAGS - | sed -e '$! d; s/^ \+//'`"
+ XINE_MAJOR_VERSION' | $CPP $CPPFLAGS - | sed -e '$!d; s/^ \+//'`"
if test "$LIB_PACKAGE" = ''; then
AC_MSG_ERROR([Couldn't determine xine-lib's text domain name])
fi
@@ -553,7 +563,8 @@ AC_SUBST(GXINE_CONFPATH)
AC_ARG_VAR([VENDOR_PKG_VERSION], [vendor build identifier string (default is
the upstream version number, suffixed with "release" or identifying a snapshot
type)])
POST_VERSION=release
-if test -d .hg || expr "$(basename "$(pwd)")" :
'gxine-[[0123456789abcdef]]\{12\}$' >/dev/null; then
+PWD=`pwd`
+if test -d .hg || expr "`basename $PWD`" : 'gxine-[[0123456789abcdef]]\{12\}$'
>/dev/null; then
POST_VERSION='hg snapshot'
elif test -d CVS; then
POST_VERSION='CVS snapshot'
diff -r b46dbeddbf9393177dd8eab867efbfd9bb091553 -r
5ddc08605e8b708fab1e8913b78a9053c7bcf825 include/cset_id.sh
--- a/include/cset_id.sh Tue Feb 20 20:21:10 2007 -0500
+++ b/include/cset_id.sh Tue Feb 20 18:57:56 2007 +0000
@@ -1,9 +1,10 @@
#! /bin/sh
test "$1" = '' || cd "$1"
+PWD=`pwd`
if test -d .hg; then
HG_ID="$(hg id 2>/dev/null | cut -d' ' -f1)"
-elif expr "$(basename "$(pwd)")" : 'gxine-[[0123456789abcdef]]\{12\}$$'
>/dev/null; then
- HG_ID="$(pwd | sed -e 's/^.*gxine-//')"
+elif expr "`basename $PWD`" : 'gxine-[[0123456789abcdef]]\{12\}$$' >/dev/null;
then
+ HG_ID="`echo $PWD | sed -e 's/^.*gxine-//'`"
fi
# extra quoting is needed for $(...) in makefile
HG_ID="#define CSET_ID \\\"${HG_ID+ }$HG_ID\\\""
diff -r b46dbeddbf9393177dd8eab867efbfd9bb091553 -r
5ddc08605e8b708fab1e8913b78a9053c7bcf825 include/i18n.h
--- a/include/i18n.h Tue Feb 20 20:21:10 2007 -0500
+++ b/include/i18n.h Tue Feb 20 18:57:56 2007 +0000
@@ -32,6 +32,9 @@
# endif
#else
/* Stubs that do something close enough. */
+/* Make sure we don't duplicate xine-lib's versions of these macros */
+#ifndef HAVE_XINEINTL_H
+#define HAVE_XINEINTL_H
# define textdomain(String) (String)
# define gettext(String) (String)
# define dgettext(Domain,Message) (Message)
@@ -44,6 +47,8 @@
# define dncgettext(Domain,Singular,Plural,N,Type) \
((N) == 1 ? (Singular) : (Plural))
# define bind_textdomain_codeset(Domain,Codeset) ((Codeset))
+#endif
+
# define _(String) (String)
# define N_(String) (String)
#endif
diff -r b46dbeddbf9393177dd8eab867efbfd9bb091553 -r
5ddc08605e8b708fab1e8913b78a9053c7bcf825 m4/_js.m4
--- a/m4/_js.m4 Tue Feb 20 20:21:10 2007 -0500
+++ b/m4/_js.m4 Tue Feb 20 18:57:56 2007 +0000
@@ -18,8 +18,11 @@ m4_define([spidermonkey_locate_header],
m4_define([spidermonkey_locate_lib],
[case "$JS_CFLAGS" in
- /usr/local/include/*)
+ -I/usr/local/include/*)
echo -L/usr/local/lib -l"$1"
+ ;;
+ -I/usr/include/firefox/*)
+ echo -L/usr/lib/firefox -R/usr/lib/firefox -l"$1"
;;
*)
echo -l"$1"
@@ -185,7 +188,7 @@ AC_DEFUN([GXINE_PATH_NSPR],
NSPR_CHECK='xulrunner-nspr nspr /nspr/'
;;
libffjs)
- NSPR_CHECK='firefox-nspr /firefox/nspr/ nspr /nspr/'
+ NSPR_CHECK='firefox-nspr /firefox/nspr/ nspr /nspr/ mps /mps/'
;;
libjs)
NSPR_CHECK='nspr /nspr/'
@@ -195,8 +198,9 @@ AC_DEFUN([GXINE_PATH_NSPR],
;;
esac
for nspr in $NSPR_CHECK; do
- if test $(expr substr $nspr 1 1) = '/'; then
- nspr_locate($(expr substr $nspr 2 99))
+ if test "`echo $nspr | sed 's/^\(.\).*$/\1/'`" = '/'; then
+ nspr_dir="`echo $nspr | sed 's/^.\(.*\)$/\1/g'`"
+ nspr_locate(${nspr_dir})
else
AC_MSG_NOTICE([trying pkgconfig $nspr])
PKG_CHECK_MODULES([NSPR],[$nspr],[NSPR_FOUND=y; break],[:])
diff -r b46dbeddbf9393177dd8eab867efbfd9bb091553 -r
5ddc08605e8b708fab1e8913b78a9053c7bcf825 src/Makefile.am
--- a/src/Makefile.am Tue Feb 20 20:21:10 2007 -0500
+++ b/src/Makefile.am Tue Feb 20 18:57:56 2007 +0000
@@ -50,7 +50,7 @@ gxine_LDADD = @XINE_LIBS@ @GTK2_LIBS@ @G
gxine_LDADD = @XINE_LIBS@ @GTK2_LIBS@ @GTHREAD2_LIBS@ \
@JS_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ $(XTEST_LIBS) $(LIRC_LIBS)
-gxine_client_LDADD = $(LDADD) @GLIB2_LIBS@
+gxine_client_LDADD = $(LDADD) @GLIB2_LIBS@ @NET_LIBS@
gxine_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS)
@@ -60,7 +60,7 @@ mktrans_SOURCES = xml_widgets.c
mktrans_CFLAGS = -DMAKE_TRANSLATION_SOURCE $(AM_CFLAGS)
-mktrans_LDADD = @XINE_LIBS@ @GLIB2_LIBS@
+mktrans_LDADD = @XINE_LIBS@ @GLIB2_LIBS@ @INTLLIBS@
noinst_HEADERS = \
console_output.h \
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
