[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./configure.ac ...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./configure.ac ... |
|
Date: |
Sun, 05 Mar 2006 01:57:08 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/03/05 01:57:08
Modified files:
. : ChangeLog Makefile.am configure.ac
plugin : Makefile.am
server : Object.h
macros : firefox.m4 kde.m4
plugin/mozilla-sdk: Makefile.am
Log message:
* Makefile.am: Always build the plugin now.
* configure.ac: Look for stdint, which is used by some old BSDs
that for the Mozilla header files. Arg. Don't use AC_CHECK_FUNCS
for finite and isfinite, try to compile code. On some systems
these are functions, and on some they're constants, so this covers
both cases to return a meaningful result. We always build the
plugin now, so having firefox-config isn't a failure anymore.
* libbase/dlmalloc.h: Move USE_DL_MALLOC ifdef up a few lines.
* macros/firefox.m4: Add new macro to repklace the old one, which
is renamed. Turns out none of the flags from mozill-config are
needed, so only find the path to install the plugin.
* macros/kde.m4: Turn more errors into notices so the build
doesn't stop if KDE parts aren't installed. We only want to use
them if building klash. Optionally skip some tests if klash isn';t
installed. Otherwise they get set if they;re installed even if
you aren't building klash.
* plugin/Makefile.am: Don't use the DEFS from firefox-config,
only MOZ_X11 is needed by the SDK. Add include path to our own
Mozilla headers.
* plugin/mozilla-sdk/Makefile.am: Add include path to our own
Mozilla headers.
* servers/Object.h: Reverse ifdef test for HAVE_FINITE so it works
even with configure errors.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.172&tr2=1.173&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Object.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.172 gnash/ChangeLog:1.173
--- gnash/ChangeLog:1.172 Sat Mar 4 16:32:24 2006
+++ gnash/ChangeLog Sun Mar 5 01:57:08 2006
@@ -1,5 +1,33 @@
2006-03-04 Rob Savoye <address@hidden>
+ * Makefile.am: Always build the plugin now.
+ * configure.ac: Look for stdint, which is used by some old BSDs
+ that for the Mozilla header files. Arg. Don't use AC_CHECK_FUNCS
+ for finite and isfinite, try to compile code. On some systems
+ these are functions, and on some they're constants, so this covers
+ both cases to return a meaningful result. We always build the
+ plugin now, so having firefox-config isn't a failure anymore.
+ * libbase/dlmalloc.h: Move USE_DL_MALLOC ifdef up a few lines.
+ * macros/firefox.m4: Add new macro to repklace the old one, which
+ is renamed. Turns out none of the flags from mozill-config are
+ needed, so only find the path to install the plugin.
+ * macros/kde.m4: Turn more errors into notices so the build
+ doesn't stop if KDE parts aren't installed. We only want to use
+ them if building klash. Optionally skip some tests if klash isn';t
+ installed. Otherwise they get set if they;re installed even if
+ you aren't building klash.
+ * plugin/Makefile.am: Don't use the DEFS from firefox-config,
+ only MOZ_X11 is needed by the SDK. Add include path to our own
+ Mozilla headers.
+ * plugin/mozilla-sdk/Makefile.am: Add include path to our own
+ Mozilla headers.
+ * servers/Object.h: Reverse ifdef test for HAVE_FINITE so it works
+ even with configure errors.
+ * plugin/mozilla-sdk/include: Copy critical header files from
+ Firefox sources so you don't need the development packages
+ installed, nor do you need fierfox-config, which isn't included at
+ all in some distributions.
+
* macros/docbook.m4: Patch from Pavekl Roskin <address@hidden>, to
fix configure test error.
* macros/libXML.m4: Patch from Pavekl Roskin <address@hidden>, to
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.14 gnash/Makefile.am:1.15
--- gnash/Makefile.am:1.14 Tue Feb 14 18:09:29 2006
+++ gnash/Makefile.am Sun Mar 5 01:57:08 2006
@@ -14,13 +14,13 @@
ACLOCAL_AMFLAGS = -I macros
STD_DIRS = libbase libgeometry server backend utilities
-if PLUGIN
-PLUG_DIR = plugin
-endif
+# if PLUGIN
+# PLUG_DIR = plugin
+# endif
if DOCBOOK
DOC_DIRS = doc
endif
-SUBDIRS = $(STD_DIRS) $(PLUG_DIR) $(DOC_DIRS)
+SUBDIRS = $(STD_DIRS) plugin $(DOC_DIRS)
DIST_SUBDIRS = $(STD_DIRS) plugin doc testsuite
#EXTRA_DIST = macros
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.44 gnash/configure.ac:1.45
--- gnash/configure.ac:1.44 Sat Mar 4 04:52:24 2006
+++ gnash/configure.ac Sun Mar 5 01:57:08 2006
@@ -160,14 +160,43 @@
GNASH_PATH_FIREFOX
AC_PATH_XTRA
AC_CHECK_HEADERS(dejagnu.h)
+AC_CHECK_HEADERS(stdint.h)
AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
AC_CHECK_LIB(Xi, XInput_find_display)
AC_CHECK_LIB(X11, XDisableAccessControl)
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open)
-AC_CHECK_FUNCS(finite isfinite)
AC_CHECK_FUNCS(strcasecmp stricmp)
AC_CHECK_FUNCS(vsnprintf)
+dnl AC_CHECK_FUNCS(finite isfinite)
+
+AC_MSG_CHECKING([for finite])
+AC_CACHE_CHECK([for finite], ac_cv_finite,
+ [AC_TRY_LINK([#include <math.h>],
+ [double x; int y; y = finite(x);],
+ ac_cv_finite=yes,
+ ac_cv_finite=no
+)])
+if test x"$ac_cv_finite" = x"yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_FINITE, [], [Has finite])
+else
+ AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING([for isfinite])
+AC_CACHE_CHECK([for isfinite], ac_cv_isfinite,
+ [AC_TRY_LINK([#include <math.h>],
+ [double x; int y; y = isfinite(x);],
+ ac_cv_isfinite=yes,
+ ac_cv_isfinite=no
+)])
+if test x"$ac_cv_isfinite" = x"yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_ISFINITE, [], [Has isfinite])
+else
+ AC_MSG_RESULT(no)
+fi
GNASH_HASHMAP
dnl AC_CHECK_LIB(c, mremap)
@@ -529,16 +558,16 @@
libsdl-mixer1.2-dev (using apt-get) or SDL_mixer-devel (using yum)."
fi
-if test x"$plugin" = x"yes"; then
- if test x"$FIREFOX_CFLAGS" != x; then
- echo " Firefox flags are: $FIREFOX_CFLAGS"
- echo " Firefox libs are: $FIREFOX_LIBS"
- echo " Plugin will be installed in ${FIREFOX_PLUGINS}"
- else
- echo "ERROR: No Firefox or Mozilla development package installed!"
- nogo=true
- fi
-fi
+dnl if test x"$plugin" = x"yes"; then
+dnl if test x"$FIREFOX_CFLAGS" != x; then
+dnl echo " Firefox flags are: $FIREFOX_CFLAGS"
+dnl echo " Firefox libs are: $FIREFOX_LIBS"
+dnl echo " Plugin will be installed in ${FIREFOX_PLUGINS}"
+dnl else
+dnl echo "ERROR: No Firefox or Mozilla development package installed!"
+dnl # nogo=true
+dnl fi
+dnl fi
if test x"$pthreads" = x"yes"; then
if test x"$PTHREAD_LIBS" != x; then
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.11 gnash/macros/firefox.m4:1.12
--- gnash/macros/firefox.m4:1.11 Fri Feb 24 00:06:21 2006
+++ gnash/macros/firefox.m4 Sun Mar 5 01:57:08 2006
@@ -16,14 +16,77 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# Configure paths for libfirefox
+dnl Configure paths for Firefox. We used to run firefox-config, but that
+dnl got too messy. Then with a little experimentation we determined
+dnl most of the options weren't actually needed... so now the handful
+dnl of critical headers are part of the plugin/mozilla-sdk sources
+dnl copied out of a current Firefox release. This greatly simplified
+dnl both the configuration and compilation processes.
AC_DEFUN([GNASH_PATH_FIREFOX],
[dnl
+ AC_ARG_ENABLE(plugin, [ --disable-plugin Enable support for being a
plugin],
+ [case "${enableval}" in
+ yes) plugin=yes ;;
+ no) plugin=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
+ esac], plugin=yes)
+
+ FIREFOX_PLUGINS=""
+ AC_ARG_WITH(plugindir, [ --with-plugindir=DIR Directory to install
Firefox plugin in],
+ [FIREFOX_PLUGINS=$withval]
+ )
+
+ if test x"${FIREFOX_PLUGINS}" = "x" ; then
+ dnl this is the path to where the plugin gets installed
+ AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
+
+ if test x"${mconfig}" = "x" ; then
+ AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
+ fi
+
+ if test x"${mconfig}" != "x" ; then
+ plugindir=`${mconfig} --libs plugin`
+ FIREFOX_PLUGINS=`echo ${plugindir} | sed -e 's:-L\(@<:@^ @:>@*\)
.*$:\1:' -e 's:^-L::'`/plugins
+ fi
+ fi
+
+ if test x"${FIREFOX_PLUGINS}" = "x" ; then
+ AC_MSG_CHECKING([for path to install plugin])
+ dirlist="${prefix}/usr/lib64 /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/lib /usr/pkg/lib /usr/X11R6/lib"
+ for i in $dirlist; do
+ if test -f $i/firefox/libnullplugin.so; then
+ FIREFOX_PLUGINS=$i/firefox/plugins
+ break
+ else
+ if test -f $i/mozilla/libnullplugin.so; then
+ FIREFOX_PLUGINS=$i/mozilla/plugins
+ break
+ fi
+ fi
+ done
+ if test x"${FIREFOX_PLUGINS}" = "x"; then
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN([no path was found for the plugin installation! ])
+ FIREFOX_PLUGINS=$HOME/.mozilla/plugins
+ else
+ AC_MSG_RESULT(yes)
+ fi
+ fi
+
+ AC_SUBST(FIREFOX_PLUGINS)
+])dnl end of GNASH_PATH_FIREFOX
+
+dnl This is the old version which we're keeping around for now. It
+dnl would be very useful if the plugin does develop more of a
+dnl dependancy on the mozilla development package.
+AC_DEFUN([GNASH_PATH_FIREFOX_FULL],
+[dnl
dnl Get the cflags and libraries
dnl
dnl This enables or disables the support to make Gnash function as a
dnl Mozilla or Firefox plugin.
- AC_ARG_ENABLE(plugin, [ --disable-plugin Enable support for being a
plugin],
+ AC_ARG_ENABLE(plugin, [ --enable-plugin-full Enable
+support for being a plugin using Firefox development packages],
[case "${enableval}" in
yes) plugin=yes ;;
no) plugin=no ;;
@@ -75,14 +138,20 @@
else
AC_MSG_CHECKING([for Firefox/Mozilla SDK])
if test "x${FIREFOX_CFLAGS}" = "x" ; then
+dnl -I/usr/include/mozilla/java
+dnl -I/usr/include/mozilla/plugin
+dnl -I/usr/include/mozilla/nspr
+dnl -I/usr/include/mozilla
FIREFOX_CFLAGS=`${mconfig} --cflags java plugin`
fi
if test "x${FIREFOX_LIBS}" = "x" ; then
+dnl -L/usr/lib/mozilla
FIREFOX_LIBS=`${mconfig} --libs java plugin`
fi
if test "x${FIREFOX_LIBS}" != "x" ; then
+dnl -DMOZ_X11=1 is all that's really needed
FIREFOX_DEFS=`${mconfig} --defines java plugin`
dnl if we don't have a path for the plugin by now, pick a default one
if test x"${FIREFOX_PLUGINS}" = "x" ; then
@@ -104,3 +173,4 @@
AC_SUBST(FIREFOX_DEFS)
AC_SUBST(FIREFOX_PLUGINS)
])
+dnl end of GNASH_PATH_FIREFO
\ No newline at end of file
Index: gnash/macros/kde.m4
diff -u gnash/macros/kde.m4:1.2 gnash/macros/kde.m4:1.3
--- gnash/macros/kde.m4:1.2 Sat Mar 4 16:32:24 2006
+++ gnash/macros/kde.m4 Sun Mar 5 01:57:08 2006
@@ -277,6 +277,8 @@
AC_DEFUN([AC_PATH_QT_MOC_UIC],
[
AC_REQUIRE([KDE_CHECK_PERL])
+ if test x"$klash" = x"yes"; then
+
qt_bindirs=""
for dir in $kde_qt_dirs; do
qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
@@ -310,7 +312,7 @@
else
UIC="echo uic not available: "
fi
-
+fi
AC_SUBST(MOC)
AC_SUBST(UIC)
@@ -328,34 +330,33 @@
KDE_TEST_RPATH=
- if test -n "$USE_RPATH"; then
+ if test x"$klash" = x"yes"; then
+ if test -n "$USE_RPATH"; then
- if test -n "$kde_libraries"; then
- KDE_TEST_RPATH="-R $kde_libraries"
- fi
+ if test -n "$kde_libraries"; then
+ KDE_TEST_RPATH="-R $kde_libraries"
+ fi
- if test -n "$qt_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
- fi
+ if test -n "$qt_libraries"; then
+ KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
+ fi
- if test -n "$x_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
- fi
+ if test -n "$x_libraries"; then
+ KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
+ fi
- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
- fi
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+ fi
-AC_MSG_CHECKING([for KDE libraries installed])
+ AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_NOTICE([your system fails at linking a small KDE application!.])
+ fi
+ fi
if eval `KDEDIR= ./conftest 2>&5`; then
kde_result=done
@@ -541,6 +542,7 @@
AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
fi
+ if test x"$klash" = x"yes"; then
KDE_SET_DEFAULT_BINDIRS
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin
$kde_default_bindirs"
KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(dcopidl)])
@@ -604,6 +606,7 @@
AC_SUBST(MEINPROC)
AC_SUBST(KDE_XSL_STYLESHEET)
AC_SUBST(XMLLINT)
+ fi
])dnl
AC_DEFUN([AC_CREATE_KFSSTND],
@@ -1705,11 +1708,14 @@
])
AC_DEFUN([KDE_EXPAND_MAKEVAR], [
+
+if test x"$klash" = x"yes"; then
savex=$exec_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
tmp=$$2
while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
exec_prefix=$savex
+fi
])
dnl ------------------------------------------------------------------------
@@ -1779,9 +1785,7 @@
fi
if test -n "$kde_widgetdir" && test ! -r
"$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-AC_MSG_ERROR([
-I can't find the designer plugins. These are required and should have been
installed
-by kdelibs])
+AC_MSG_NOTICE([I can't find the KDE designer plugins.])
fi
if test -n "$kde_widgetdir"; then
@@ -1875,6 +1879,7 @@
kde_use_extra_includes="$withval",
kde_use_extra_includes=NONE
)
+if test x"$klash" = x"yes"; then
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
@@ -1915,7 +1920,7 @@
else
kde_use_extra_libs="no"
fi
-
+fi
AC_SUBST(USER_LDFLAGS)
AC_MSG_RESULT($kde_use_extra_libs)
@@ -2511,17 +2516,17 @@
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
else
- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
- AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
- else
- AC_MSG_WARN([libjpeg not found. disable JPEG support.])
- fi
+dnl if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
+dnl AC_MSG_WARN([
+dnl There is an installation error in jpeg support. You seem to have only one
+dnl of either the headers _or_ the libraries installed. You may need to either
+dnl provide correct --with-extra-... options, or the development package of
+dnl libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
+dnl Disabling JPEG support.
+dnl ])
+dnl else
+dnl AC_MSG_WARN([libjpeg not found. disable JPEG support.])
+dnl fi
jpeg_incdir=
LIBJPEG=
fi
@@ -3388,6 +3393,8 @@
AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
USE_RPATH=$enableval, USE_RPATH=yes)
+if test x"$klash" = x"yes"; then
+
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
KDE_RPATH="-R \$(libdir)"
@@ -3408,6 +3415,7 @@
KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
fi
fi
+fi
AC_SUBST(KDE_EXTRA_RPATH)
AC_SUBST(KDE_RPATH)
AC_SUBST(X_RPATH)
@@ -4800,49 +4808,47 @@
dnl It only matters for --help, since we set the prefix in this function
anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
- KDE_SET_DEFAULT_BINDIRS
- if test "x$prefix" = "xNONE"; then
+ KDE_SET_DEFAULT_BINDIRS
+ if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix
from it
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
- else
+ KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+ else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in
PATH
- kde_save_PATH="$PATH"
- PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
- PATH="$kde_save_PATH"
- fi
-
- kde_libs_prefix=`$KDECONFIG --prefix`
- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix
'$kde_libs_prefix' for kdelibs.
- This means it has been moved since you installed it.
- This won't work. Please recompile kdelibs for the new
prefix.
- ])
- fi
- kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix`
-
- AC_MSG_CHECKING([where to install])
- if test "x$prefix" = "xNONE"; then
- prefix=$kde_libs_prefix
- AC_MSG_RESULT([$prefix (as returned by kde-config)])
- else
+ kde_save_PATH="$PATH"
+ PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+ KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs],
[KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+ PATH="$kde_save_PATH"
+ fi
+
+ kde_libs_prefix=`$KDECONFIG --prefix`
+ if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
+ AC_MSG_NOTICE([$KDECONFIG --prefix outputed the non existant prefix
'$kde_libs_prefix' for kdelibs.
+ This means it has been moved since you installed it.])
+ fi
+ kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+ kde_libs_suffix=`$KDECONFIG --libsuffix`
+
+ AC_MSG_CHECKING([where to install])
+ if test "x$prefix" = "xNONE"; then
+ prefix=$kde_libs_prefix
+ AC_MSG_RESULT([$prefix (as returned by kde-config)])
+ else
dnl --prefix was given. Compare prefixes and warn (in
configure.in.bot.end) if different
- given_prefix=$prefix
- AC_MSG_RESULT([$prefix (as requested)])
- fi
+ given_prefix=$prefix
+ AC_MSG_RESULT([$prefix (as requested)])
+ fi
- # And delete superfluous '/' to make compares easier
- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+ # And delete superfluous '/' to make compares easier
+ prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+ exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+ given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- AC_SUBST(KDECONFIG)
- AC_SUBST(kde_libs_prefix)
- AC_SUBST(kde_libs_htmldir)
+ AC_SUBST(KDECONFIG)
+ AC_SUBST(kde_libs_prefix)
+ AC_SUBST(kde_libs_htmldir)
- KDE_FAST_CONFIGURE
- KDE_CONF_FILES
+ KDE_FAST_CONFIGURE
+ KDE_CONF_FILES
])
pushdef([AC_PROG_INSTALL],
@@ -5712,8 +5718,7 @@
AC_DEFUN([KDE_CHECK_PERL],
[
KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
- AC_MSG_ERROR([No Perl found in your $PATH.
-We need perl to generate some code.])
+ AC_MSG_NOTICE([No Perl found in your $PATH.])
])
AC_SUBST(PERL)
])
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.13 gnash/plugin/Makefile.am:1.14
--- gnash/plugin/Makefile.am:1.13 Sat Mar 4 04:52:24 2006
+++ gnash/plugin/Makefile.am Sun Mar 5 01:57:08 2006
@@ -42,8 +42,8 @@
-I$(top_srcdir)/libgeometry \
-I$(top_srcdir)/server \
-I$(srcdir)/mozilla-sdk \
+ -I$(srcdir)/mozilla-sdk/include \
$(LIBXML_CFLAGS) \
- $(FIREFOX_CFLAGS) \
$(GLEXT_CFLAGS) \
$(GTK2_CFLAGS) \
$(PANGO_CFLAGS) \
@@ -62,8 +62,8 @@
# XP_UNIX This needs to get defined for npapi.h on unix platforms.
# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
# api gets control.
-AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
-AM_LDFLAGS = $(FIREFOX_LIBS) $(X_LIBS) -lX11 -lXi -lXmu \
+AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11
+AM_LDFLAGS = $(X_LIBS) -lX11 -lXi -lXmu \
$(SDL_LIBS) \
$(SDL_MIXER_LIBS)\
$(OPENGL_LIBS) \
@@ -95,7 +95,7 @@
../server/libgnashserver.la\
../libgeometry/libgnashgeo.la\
../libbase/libgnashbase.la
-libgnashplugin_la_LDFLAGS = -L$(plugindir) -module -avoid-version -no-undefined
+libgnashplugin_la_LDFLAGS = -module -avoid-version -no-undefined -L$(plugindir)
# For now the plugin has to be installed in the root plugin
# directory for Firefox. For some reason if the same file is
Index: gnash/plugin/mozilla-sdk/Makefile.am
diff -u gnash/plugin/mozilla-sdk/Makefile.am:1.6
gnash/plugin/mozilla-sdk/Makefile.am:1.7
--- gnash/plugin/mozilla-sdk/Makefile.am:1.6 Sat Jan 28 01:14:33 2006
+++ gnash/plugin/mozilla-sdk/Makefile.am Sun Mar 5 01:57:08 2006
@@ -21,7 +21,7 @@
INCLUDES = -I.. \
-I$(srcdir) \
- $(FIREFOX_CFLAGS)
+ -I$(srcdir)/include
AM_CXXFLAGS = $(CFLAGS) $(INCLUDES)
AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
Index: gnash/server/Object.h
diff -u gnash/server/Object.h:1.3 gnash/server/Object.h:1.4
--- gnash/server/Object.h:1.3 Tue Feb 28 15:43:59 2006
+++ gnash/server/Object.h Sun Mar 5 01:57:08 2006
@@ -35,7 +35,7 @@
struct character_def;
struct sound_sample;
-#ifdef HAVE_FINITE
+#ifndef HAVE_ISFINITE
# ifndef isfinite
# define isfinite finite
# endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./Makefile.am ./configure.ac ...,
Rob Savoye <=