[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r9952: More cleanups for xpcom:
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r9952: More cleanups for xpcom: |
Date: |
Tue, 07 Oct 2008 12:13:09 +0200 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9952
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Tue 2008-10-07 12:13:09 +0200
message:
More cleanups for xpcom:
1. Rename --with-xpcom-lib to --with-xpcom-sdk-dir
2. Don't use pkg-config to find libs (won't work), rather scan /usr/lib/iceape
3. Use libxpcomglue_s.a, not libxpcomglue.a
4. Re-introduce use of XPCOM_LIB in plugin link line
modified:
macros/xpcom.m4
plugin/Makefile.am
=== modified file 'macros/xpcom.m4'
--- a/macros/xpcom.m4 2008-10-06 16:48:39 +0000
+++ b/macros/xpcom.m4 2008-10-07 10:13:09 +0000
@@ -45,28 +45,49 @@
])
dnl Look for the library
- AC_ARG_WITH(xpcom_lib, AC_HELP_STRING([--with-xpcom-lib], [directory where
XPCOM libraries are]), with_xpcom_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_xpcom_lib, [
- if test x"${with_xpcom_lib}" != x ; then
- if test -f ${with_xpcom_libs}/libxpcomglue.a; then
- ac_cv_path_xpcom_lib="-L`(cd ${with_xpcom_lib}; pwd)` -lxpcomglue
-lnspr4 -lplds4"
+ AC_ARG_WITH(xpcom-sdk-dir, AC_HELP_STRING([--with-xpcom-sdk-dir], [directory
where XPCOM SDK is]), with_xpcom_sdk_dir=${withval})
+ AC_CACHE_VAL(ac_cv_path_xpcom_sdk_dir, [
+ if test x"${with_xpcom_sdk_dir}" != x ; then
+ if test -f ${with_xpcom_sdk_dir}/libxpcomglue_s.a; then
+ ac_cv_path_xpcom_sdk_dir="-L`(cd ${with_xpcom_sdk_dir}; pwd)`
-lxpcomglue_s -lnspr4 -lplds4"
+ else
+ AC_MSG_ERROR([${with_xpcom_sdk_dir} directory doesn't contain
libxpcomglue_s.a!])
fi
fi
])
if test x$xpcom = xyes; then
if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_xpcom_incl}" = x; then
- if $PKG_CONFIG --exists libxul; then
- ac_cv_path_xpcom_lib="`$PKG_CONFIG --libs libxul`"
- ac_cv_path_xpidl="`$PKG_CONFIG --libs-only-L libxul`"
- ac_cv_path_xpcom_incl="`$PKG_CONFIG --cflags-only-I libxul`"
- fi
- # prefer libxul-unstable for cflags.
+
+ # Look for libxpcomglue_s.a (version 1.8 !!) if not explicitly given
+ if test x$ac_cv_path_xpcom_sdk_dir = x; then
+ for i in /usr/lib/iceape; do
+ # TODO: check version ! we do NOT want to use 1.9 here !!!
+ # TODO: check availability of nspr4 and plds4 (may be in /usr/lib
too)
+ if test -e "${i}/libxpcomglue_s.a"; then
+ ac_cv_path_xpcom_sdk_dir="-L${i} -lxpcomglue_s -lnspr4 -lplds4"
+ break
+ fi
+ done
+ fi
+
+ # Look for xpcom headers (version 1.8 !!) if not explicitly given
+ if test x$ac_cv_path_xpcom_incl = x; then
+ # Prefer libxul-unstable for cflags.
if $PKG_CONFIG --exists libxul-unstable; then
- ac_cv_path_xpcom_incl="`$PKG_CONFIG --cflags-only-I libxul-unstable`"
+ ac_cv_path_xpcom_incl="`$PKG_CONFIG --cflags-only-I
libxul-unstable`"
+ else
+ if $PKG_CONFIG --exists libxul; then
+ ac_cv_path_xpcom_incl="`$PKG_CONFIG --cflags-only-I libxul`"
+ fi
fi
fi
+
+ # Look for libxul. TODO: needed at all ?
+ if $PKG_CONFIG --exists libxul; then
+ ac_cv_path_xpidl="`$PKG_CONFIG --libs-only-L libxul`"
+ fi
+
fi
fi
@@ -81,8 +102,8 @@
XPIDL=""
fi
- if test x"${ac_cv_path_xpcom_lib}" != x ; then
- XPCOM_LIBS="${ac_cv_path_xpcom_lib}"
+ if test x"${ac_cv_path_xpcom_sdk_dir}" != x ; then
+ XPCOM_LIBS="${ac_cv_path_xpcom_sdk_dir}"
has_xpcom=yes
else
XPCOM_LIBS=""
=== modified file 'plugin/Makefile.am'
--- a/plugin/Makefile.am 2008-10-07 07:00:27 +0000
+++ b/plugin/Makefile.am 2008-10-07 10:13:09 +0000
@@ -32,7 +32,7 @@
INCLUDES = $(XPCOM_CFLAGS)
# Adding XPCOM_LIBS here breaks loading of plugin under iceapi from lenny.
# See bug #24469
-#AM_LDFLAGS = $(XPCOM_LIBS)
+AM_LDFLAGS = $(XPCOM_LIBS)
SUBDIRS += xpcom
endif
if WIN32
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r9952: More cleanups for xpcom:,
Sandro Santilli <=