[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-275-g89aa145 |
|
Date: |
Mon, 14 Mar 2011 14:13:41 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 89aa145e8e49ac6c5c90eeb933e3e115c1e10a03 (commit)
via d2131f13a11618d1d5c8aae7417fe71b511bdea8 (commit)
from 76555bab996cf2c3a16eb8334f5ee879cb1b40b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=89aa145e8e49ac6c5c90eeb933e3e115c1e10a03
commit 89aa145e8e49ac6c5c90eeb933e3e115c1e10a03
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 14 13:30:21 2011 +0100
Remove unused code.
diff --git a/configure.ac b/configure.ac
index 7dc3c92..d55f4af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,17 +201,13 @@ BUILDDATE="`date +%Y%m%d`"
AC_SUBST(BUILDDATE)
dnl These are required by automake
-dnl AM_INIT_AUTOMAKE(gnash, "trunk$BUILDDATE")
AM_INIT_AUTOMAKE([tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
-dnl AC_DISABLE_STATIC dnl Disable building static libs.
-
AM_GNU_GETTEXT([external])
AM_CONDITIONAL(HAS_GETTEXT, test x$ac_cv_path_XGETTEXT != x)
-dnl AM_GNU_GETTEXT_VERSION(0.15)
dnl Many of the Gnash macros depend on gettext macros defining shlibext; recent
dnl gettext however does not.
@@ -228,15 +224,6 @@ dnl This is primarily used when compiling for a similar
architecture,
dnl like pentium->geode, which can use the same compiler, but have
dnl different development libraries.
-dnl I want to deprecate this option for the new sysroot name to be
-dnl consistant with other tools. This will be left for a while as
-dnl a transistion.
-AC_ARG_WITH(top_level,
- AC_HELP_STRING([--with-top-level],
- [top level directory for cross compiling files]),
- with_top_level=${withval} ;
- cross_compiling=yes)
-
AC_ARG_WITH(sysroot,
AC_HELP_STRING([--with-sysroot],
[system root directory for cross compiling]),
@@ -266,8 +253,6 @@ AC_ARG_WITH([android],
)
CROSS_CXXFLAGS=
if test x"${android_ndk}" != xno; then
-dnl LDFLAGS=-Wl,--dynamic-linker -Wl,/system/bin/linker -nostdlib -Wl,-rpath
-Wl,/system/lib -Wl,-rpath -Wl,${android_ndk}/usr/lib -L${android_ndk}/usr/lib
-lc -o hello ${android_ndk}/usr/lib/crtbegin_dynamic.o
-dnl CROSS_CXXFLAGS=-mandroid -fexceptions -I${android_ndk}/include
CROSS_CXXFLAGS=-mandroid -fexceptions
if test x"${with_top_level}" = x; then
with_top_level=/usr/local/android-arm/sysroot/usr
@@ -289,7 +274,6 @@ AC_ARG_WITH(cpu,
esac],with_cpu=none)
if test x"$with_cpu" != x"none"; then
-dnl $CXXFLAGS="$CXXFLAGS -march=${with_cpu}"
cross_compiling=yes
fi
@@ -299,13 +283,9 @@ AC_C_INLINE
AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
-dnl -- AM_CONDITIONAL(STATIC_GUI, test x"${dynamic_gui}" = xno -o
x"${enable_shared}" = xno)
AC_PATH_PROG(DEJAGNU, runtest)
-dnl AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has
lt_dlmutex_register]),
-dnl AC_DEFINE(LT_DLMUTEX, 0, [doesn't
have lt_dlmutex_register]) )
-
dnl These options are for Cygnal, which collects optional statistics
dnl on all the network traffic By default, we turn on statistics
dnl collecting for the incoming and outgoing queues, since those are
@@ -438,7 +418,6 @@ AC_ARG_WITH(security,
nsecurity=0
while test -n "${withval}" ; do
val=`echo ${withval} | cut -d ' ' -f 1`
-dnl security_list="${security_list} ${val}"
[case "${val}" in
solreadonly)
solreadonly=yes
@@ -509,14 +488,7 @@ rm -f .tmp
dnl is there any good way to report what we found here?
AC_MSG_RESULT()
if test x"${archiver}" != x && test "${archiver}" -eq 1; then
-dnl if test "$enable_shared" = no; then
-dnl AR="libtool -static"
-dnl else
-dnl AR="libtool -dynamic"
-dnl CXXFLAGS="${CXXFLAGS} -dynamic"
export MACOSX_DEPLOYMENT_TARGET="10.3"
-dnl fi
-dnl AR_FLAGS="-o"
darwin=yes
else
darwin=no
@@ -835,7 +807,7 @@ if test x"${build_sdl}" = xauto; then
if test xyes = x"${has_sdl}"; then
build_sdl=yes
else
- AC_MSG_NOTICE([sdl GUI won't be built (no sdl development files found)])
+ AC_MSG_NOTICE([sdl GUI will not be built (no sdl development files found)])
build_sdl=no
fi
fi
@@ -1296,7 +1268,7 @@ AC_SUBST(DLPREOPEN)
GNASH_PKG_FIND([ltdl], [ltdl.h], [libltdl library], [lt_dlinit])
if test x"$has_ltdl" = x"yes";then
- AC_DEFINE(HAVE_LTDL, [1], [Libtool 2.x defines this, but libtool 1.5
doesn't])
+ AC_DEFINE(HAVE_LTDL, [1], [Libtool 2.x defines this, but libtool 1.5 does
not])
fi
dnl --------------------------------------------------------
@@ -1421,31 +1393,11 @@ AC_ARG_ENABLE(allstatic,
esac],allstatic=no)
AM_CONDITIONAL(ALLSTATIC, test x$allstatic = xyes)
-
-dnl --------------------------------------------------------
-dnl SHM
-dnl --------------------------------------------------------
-AC_ARG_WITH(shm,
- AC_HELP_STRING([--with-shm],[specify a shared memory type.]),
- [case "${withval}" in
- sysv) with_shm=sysv
- ;;
- posix) with_shm=posix
- ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --with-shm option (try sysv
or posix])
- ;;
- esac],with_shm=sysv)
-
-if test x"${with_shm}" = x"sysv"; then
- AC_DEFINE([USE_SYSV_SHM], [1], [Use SYSV shared memory for compatability])
- dnl IPC_INFO isn't portable, and doesn't exist on BSD
- AC_TRY_COMPILE([#include <sys/ipc.h> #include <sys/shm.h>], [
- int flag = IPC_INFO; ],
- AC_DEFINE([HAVE_IPC_INFO], [1], [Use shm_info])
- )
-else
- AC_DEFINE([USE_POSIX_SHM], [1], [Use POSIX shared memory])
-fi
+dnl IPC_INFO isn't portable, and doesn't exist on BSD
+AC_TRY_COMPILE([#include <sys/ipc.h> #include <sys/shm.h>], [
+ int flag = IPC_INFO; ],
+ AC_DEFINE([HAVE_IPC_INFO], [1], [Use ipc_info])
+)
dnl --------------------------------------------------------
dnl Disable menus
@@ -1860,23 +1812,11 @@ if test x"$gcc_cv_ld_as_needed" = xyes; then
fi
AC_MSG_RESULT($gcc_cv_ld_as_needed)
-dnl AC_MSG_CHECKING(linker --no-undefined support)
-dnl gcc_cv_ld_undef_needed=no
-dnl # Check if linker supports --no-undefined
-dnl if $LD --help 2>/dev/null | grep as-needed > /dev/null; then
-dnl gcc_cv_ld_undef_needed=yes
-dnl fi
-dnl if test x"$gcc_cv_ld_undef_needed" = xyes; then
-dnl LDFLAGS=" ${LDFLAGS} -Wl,--no-undefined"
-dnl fi
-dnl AC_MSG_RESULT($gcc_cv_ld_undef_needed)
-
AC_DEFINE(USE_GIF, [1], [Use the GIF library])
AC_DEFINE(USE_PNG, [1], [Use the PNG library])
AM_CONDITIONAL(USE_GIF, true)
AM_CONDITIONAL(USE_PNG, true)
-dnl GNASH_PKG_FIND(dmalloc, [dmalloc.h], [dmalloc], mallinfo)
AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
AC_PATH_TOOL([AUTOTRACE], [autotrace])
@@ -2005,14 +1945,9 @@ AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAVE_GETPWNAM, 1,
[Has getpwnam] ))
dnl X11 is needed for fltk (at least),
dnl and probably for many other guis too ...
-dnl if ! test x$build_fb = xyes; then # <--- this is wrong as build_x is
non-exclusive
-dnl AC_PATH_XTRA
-dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
-dnl AC_CHECK_LIB(gmp, _gmp_get_memory_functions)
- GNASH_PATH_X11
- AC_CHECK_LIB(Xi, XInput_find_display)
- AC_CHECK_LIB(X11, XDisableAccessControl)
-dnl fi
+GNASH_PATH_X11
+AC_CHECK_LIB(Xi, XInput_find_display)
+AC_CHECK_LIB(X11, XDisableAccessControl)
AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open shm_unlink)
@@ -2077,9 +2012,6 @@ if test x$ipc_key = xno; then
)
fi
-dnl AC_CHECK_FUNCS(strcasecmp stricmp)
-dnl AC_CHECK_FUNCS(vsnprintf)
-
AC_CACHE_CHECK([for finite], ac_cv_finite,
[AC_TRY_COMPILE([
#include <math.h>
@@ -2160,7 +2092,7 @@ AC_CACHE_CHECK([whether struct tm has tm_gmtoff],
ac_cv_tm_gmtoff, [
AC_TRY_LINK([
/* ctime(1) says "The glibc version of struct tm has additional fields
* defined when _BSD_SOURCE was set before including <time.h>"
- * In practice, you don't need to define it yourself (tested on glibc-2.2.1
+ * In practice, you do not need to define it yourself (tested on glibc-2.2.1
* and 2.3.6) but if you *do* define it yourself, it makes *all* functions
* favour BSD-like behaviour over of GNU/POSIX, which seems dangerous.
*/
@@ -2201,19 +2133,13 @@ AC_CHECK_FUNCS(sysconf)
AC_CHECK_FUNCS(shmget shmat shmdt mmap)
AC_CHECK_FUNCS(memmove)
AC_CHECK_FUNCS(scandir) dnl supported by BSD and Linux, but you never
know...
-dnl AC_CHECK_FUNC(strndup, AC_DEFINE(HAVE_STRNDUP, 1, [Has strndup()] ))
AC_CHECK_FUNC(clock_gettime, AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Has
clock_gettime()] ))
-dnl AC_CHECK_FUNCS(strlcpy, AC_DEFINE(HAVE_STRLCPY_PROTO, [1],[Define if you
have the strlcpy prototype]))
-dnl AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT_PROTO, [1],[Define if you
have the strlcat prototype]))
dnl Look for Win32 networking stuff
AC_CHECK_HEADERS(winsock.h)
AC_CHECK_HEADERS(winsock2.h)
AC_CHECK_FUNCS(socket)
AC_CHECK_FUNCS(CreateFileMappingA)
-dnl Shm::resize() uses this if it exists
-AC_CHECK_LIB(c, mremap)
-
GNASH_PKG_FIND(nspr, [nspr.h], [Netscape Portable Runtime (NSPR)], PR_Init)
AC_PATH_TOOL(WINDRES, [windres])
@@ -2374,18 +2300,6 @@ AM_CONDITIONAL(ENABLE_HAXE, [ test x"$HAXE" != x ])
AC_PATH_PROG(DOXYGEN, doxygen)
AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
-dnl currently unused
-dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
-
-dnl Qtopia is a desktop environment for embedded devices.
-dnl GNASH_PATH_QTOPIA3
-dnl GNASH_PATH_QTOPIA4
-has_qtopia3=no
-has_qtopia4=no
-
-
-AM_CONDITIONAL(HAVE_QTOPIA3, [test x$has_qtopia3 = xyes])
-AM_CONDITIONAL(HAVE_QTOPIA4, [test x$has_qtopia4 = xyes])
AM_CONDITIONAL(HAVE_KDE3, [test x$has_kde3 = xyes])
AM_CONDITIONAL(HAVE_KDE4, [test x$has_kde4 = xyes])
AM_CONDITIONAL(HAVE_QT3, [test x$has_qt3 = xyes])
@@ -2429,7 +2343,6 @@ dnl if kde isn't installed, even if it's specified, don't
try to build
dnl the KPARTS plugin, which is KDE based.
if test x$has_kde3 = xno -a x$build_kparts3 = xyes; then
build_kparts3=no
-dnl build_kde3=no
AC_MSG_WARN(["Disabling KPARTS 3.x plugin, no KDE development found"])
fi
@@ -2438,7 +2351,6 @@ if test x$build_kde3 = xno -a x$build_kparts3 = xyes; then
fi
if test x$has_kde4 = xno -a x$build_kparts4 = xyes; then
build_kparts4=no
-dnl build_kde4=no
AC_MSG_WARN(["Disabling KPARTS 4.x plugin, no KDE 4.x development found"])
fi
@@ -2573,9 +2485,7 @@ if test x"$build_media_gst" = "xyes"; then
fi
AM_CONDITIONAL(HAVE_CAIRO, [true])
-dnl AM_CONDITIONAL(HAVE_CAIRO, [test x"${has_cairo}" = xyes])
AM_CONDITIONAL(HAVE_OPENGL, [true])
-dnl AM_CONDITIONAL(HAVE_OPENGL, test x"${has_opengl}" = xyes)
AM_CONDITIONAL(USE_SOUND_SDL, test x$build_sound_sdl = xyes)
AM_CONDITIONAL(USE_SOUND_AHI, test x$build_sound_ahi = xyes)
@@ -2602,7 +2512,7 @@ if test x$build_sound_mkit = xyes; then
if test x"${haiku}" != xyes; then
AC_MSG_ERROR([Media Kit sound handling is supported only under Haiku]);
else
- AC_DEFINE([SOUND_MKIT], [1], [Use Haiku's Media Kit for sound handling])
+ AC_DEFINE([SOUND_MKIT], [1], [Use Haiku Media Kit for sound handling])
fi
fi
@@ -2633,7 +2543,6 @@ AM_CONDITIONAL(ENABLE_PDF, [ test x"$DB2X_PDF" ])
AM_CONDITIONAL(ENABLE_HTML, [ test x"$XSLTPROC" != x -a x"$docbook_styles" !=
x ])
AM_CONDITIONAL(ENABLE_FOP, [ test x"$FOP" != x -a x"$docbook_styles" != x ])
AM_CONDITIONAL(ENABLE_XMLTEX, [ test x"$PDFXMLTEX" != x -a x"$XSLTPROC" != x
-a x"$docbook_styles" != x ])
-dnl AM_CONDITIONAL(ENABLE_DBLATEX, [ test x"$DBLATEX" != x ])
AM_CONDITIONAL(ENABLE_MAN, [ test x"$DB2X_MAN" != x -o x"$DB2X_MANXML" != x ])
AM_CONDITIONAL(HAVE_AGG, [test x"${AGG_LIBS}" != x])
@@ -2686,11 +2595,6 @@ GNASH_PATH_PTHREADS
GNASH_PATH_BOOST
-dnl disable --gcc-arch by default
-dnl AX_GCC_ARCHFLAG
-dnl AC_SUBST(CFLAGS)
-dnl AC_SUBST(CLIBS)
-
AC_ARG_ENABLE([strict],
AC_HELP_STRING([--enable-strict],[Accept only standards compliant code (GCC
only)]),
[case "${enableval}" in
@@ -2834,14 +2738,13 @@ if test x"$ac_cv_gcc_visibility" = xyes -a
x"$enable_visibility" != xno; then
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
fi
-dnl Define convienience constants so Gnash can print out the
+dnl Define convenience constants so Gnash can print out the
dnl default configuration of the build.
RENDERER_CONFIG="${renderer_list}"
RENDERER_LIBS=
for rend in `echo "${add_renderer}" | tr ',' ' '`; do
RENDERER_LIBS="${RENDERER_LIBS}
\$(top_builddir)/librender/libgnash${rend}.la"
done
-dnl echo "RENDERER_LIBS=$RENDERER_LIBS"
AC_SUBST(RENDERER_LIBS)
AC_SUBST(RENDERER_CONFIG)
@@ -2904,8 +2807,6 @@ fi
SUPPORTED_GUIS="`echo ${SUPPORTED_GUIS} | sed 's/,//'`" # Strip leading comma
AC_SUBST(SUPPORTED_GUIS)
-dnl AC_CONFIG_LINKS(doc/C/images)
-dnl AC_CONFIG_LINKS(gnashconfig.h)
AC_CONFIG_LINKS(cygnal/testsuite/cygnal.all/cygnalrc:cygnal/testsuite/cygnal.all/cygnalrc.in)
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc:testsuite/libbase.all/gnashrc.in)
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc-local:testsuite/libbase.all/gnashrc-local.in)
@@ -3050,12 +2951,6 @@ else
echo " KPARTS 4.x plugin disabled."
fi
-dnl -- if test x"${dynamic_gui}" = x"yes"; then
-dnl -- echo " Loadable GUI & renderer enabled."
-dnl -- else
-dnl -- echo " Loadable GUI & renderer disabled (default). Use
--enable-dynamic-gui to enable."
-dnl -- fi
-
# set a variable if we shouldn't continue. This way we can print
# out everything that is missing in one pass, hopefully making it
# easy for new developers to get everything they need installed.
@@ -3422,9 +3317,6 @@ if test x$build_fltk = xyes; then
echo " There are currently no Debian or RPM packages for
FLTK2;" >&3
echo " see http://www.fltk.org to install it from source."
>&3
echo " or change to a different gui with --enable-gui=..."
>&3
-dnl What it was for FLTK 1:
-dnl echo " or .deb users: apt-get install fltk-1.1-dev"
-dnl echo " or .rpm users: yum install fltk-devel"
fi
fi
@@ -3436,11 +3328,6 @@ if test x$build_fltk = xyes; then
echo " Xft flags are: default include path"
fi
echo " Xft libs are: $XFT_LIBS"
-dnl else
-dnl echo " ERROR: No Xft development package installed!" >&3
-dnl echo " Install the xft development package" >&3
-dnl echo " or .deb users: apt-get install libxft-dev" >&3
-dnl echo " or .rpm users: yum install xft-devel" >&3
fi
fi
@@ -3465,13 +3352,7 @@ fi
unset need_sdl
if test x"$nsapi" = 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"
echo " Plugin will be installed in ${FIREFOX_PLUGINS}"
-dnl else
-dnl echo " ERROR: No Firefox or Mozilla development package
installed!" >&3
-dnl fi
fi
if test x"${pthreads}" = x"yes"; then
diff --git a/macros/qtopia.m4 b/macros/qtopia.m4
deleted file mode 100644
index 3c0df4f..0000000
--- a/macros/qtopia.m4
+++ /dev/null
@@ -1,208 +0,0 @@
-dnl
-dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl You should have received a copy of the GNU General Public License
-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
-
-
-dnl address@hidden pts/8> QtCore QtSvg Qtnetwork QtXml
-dnl QtCore: Command not found.
-dnl address@hidden pts/8>
-L/home/rob/projects/gnu/i686-pc-linux-gnulibc1/qtopia/lib -lQtSvg
-L/home/rob/projects/gnu/i686-pc-linux-gnulibc1/qtopia/qtopiacore/target/lib
-lQtSql -lQtXml -lQtGui -lpng -lQtNetwork -lQtCore -lz -lm -lrt -ldl -lpthread
-lqtopiabase -lqtopia -lmd5 -lqtopia-sqlite -lqtopiasecurity
-Wl,-rpath,/usr/local/qtopia-prefix/lib
-dnl -L/home/rob/projects/gnu/i686-pc-linux-gnulibc1/qtopia/lib: Command not
found.
-
-AC_DEFUN([GNASH_PATH_QTOPIA],
-[
-
- has_qtopia=no
- gnash_qtopia_version=0
-
- dnl the list of Qtopia headers we need
- dnl Look for the header
- AC_ARG_WITH(qtopia, AC_HELP_STRING([--with-qtopia], [directory where Qtopia
is installed]), with_qtopia=${withval})
- AC_CACHE_VAL(ac_cv_path_qtopia_incl,[
- if test x"${with_qtopia}" != x ; then
- if test -f ${with_qtopia}/include/qtopiamail/qtopiamail.h ; then
- gnash_qtopia_topdir="${with_qtopia}"
- ac_cv_path_qtopia_incl="-I`(cd ${with_qtopia}/include; pwd)`"
- gnash_qtopia_version=4
- else
- gnash_qtopia_topdir="${with_qtopia}"
- if test -f ${with_qtopia}/include/qtopia/mail/qtopiamail.h ; then
- ac_cv_path_qtopia_incl="-I`(cd ${with_qtopia}/include; pwd)`"
- gnash_qtopia_version=2
- else
- AC_MSG_ERROR([${with_qtopia} directory doesn't contain Qtopia
headers])
- fi
- fi
- if test -f ${with_qtopia}/lib/libqtopiamail.a -o -f
${with_qtopia}/lib/libqtopiamail.${shlibext}; then
- ac_cv_path_qtopia_lib="-L`(cd ${with_qtopia}/lib; pwd)`"
- else
- AC_MSG_ERROR([${with_qtopia}/lib directory doesn't contain Qtopia
libraries])
- fi
- fi
- ])
-
-
- if test x"${QPEDIR}" != x; then
- gnash_qtopia_topdir=$QPEDIR
- else
- if test x"${gnash_qtopia_topdir}" = x; then
- AC_MSG_ERROR([QPEDIR must be set in your shell environment or use
--with-qtopia=])
- fi
- fi
-
- if test x"${ac_cv_path_qtopia_incl}" = x; then
- dnl Attempt to find the top level directory, which unfortunately
- dnl has a x version number attached. At least on Debain based
- dnl systems, this doesn't seem to get a directory that is
- dnl unversioned.
- if test x"${gnash_qtopia_version}" = x; then
- AC_MSG_CHECKING([for libqtopia header])
- if test -f ${gnash_qtopia_topdir}/include/qtopiamail/qtopiamail.h ; then
- ac_cv_path_qtopia_incl="-I`(cd ${gnash_qtopia_topdir}/include; pwd)`"
- gnash_qtopia_version=4
- else
- if test -f ${gnash_qtopia_topdir}/include/qtopia/mail/qtopiamail.h ;
then
- ac_cv_path_qtopia_incl="-I`(cd ${gnash_qtopia_topdir}/include; pwd)`"
- gnash_qtopia_version=2
- else
- AC_MSG_ERROR([${gnash_qtopia_topdir} directory doesn't contain
qtopia])
- fi
- fi
- AC_MSG_RESULT(${ac_cv_path_qtopia_incl})
- fi dnl end of gnash_qtopia_version
- fi dnl end of ac_cv_path_qtopia_incl
-
- AC_MSG_CHECKING([for the Qtopia Version])
- AC_MSG_RESULT(${gnash_qtopia_version})
-
- dnl this a sanity check for Qtopia 2
- AC_MSG_CHECKING([Sanity checking the Qtopia header installation])
- qt_headers="qmainwindow.h qmenubar.h qpopupmenu.h qapplication.h"
- if test ${gnash_qtopia_version} -eq 2; then
- if test x"${ac_cv_path_qtopia_incl}" != x; then
- for i in $qt_headers; do
- if ! test -f ${gnash_qtopia_topdir}/include/$i; then
- AC_MSG_WARN([${gnash_qtopia_topdir}/include/$i not found!])
- qtopia_nogo=yes
- fi
- done
- fi
- fi
-
- dnl this a sanity check for Qtopia 4
- qt_headers="QtXml QtGui QtCore QtNetwork QtSql"
- if test ${gnash_qtopia_version} -eq 4; then
- if test x"${ac_cv_path_qtopia_incl}" != x; then
- for i in $qt_headers; do
- if ! test -d ${gnash_qtopia_topdir}/qtopiacore/target/include/$i; then
- AC_MSG_WARN([${gnash_qtopia_topdir}/qtopiacore/target/include/$i not
found!])
- qtopia_nogo=yes
- fi
- done
- fi
- fi
-
- if test x"${qtopia_nogo}" = xyes; then
- AC_MSG_ERROR([Broken Qtopia header installation!])
- else
- AC_MSG_RESULT([fine])
- fi
-
- if test ${gnash_qtopia_version} -eq 0; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT([${gnash_qtopia_version}])
- fi
-
- dnl the list of Qtopia libs we need
- qt_libs="qtopiabase qtopia qpe qt"
-
- if test x"${ac_cv_path_qtopia_lib}" = x; then
- if test x"${ac_cv_path_qtopia_lib}" = x; then
- AC_MSG_CHECKING([for libqtopia library])
- if test -f $gnash_qtopia_topdir/lib/libqpe.a -o -f
$gnash_qtopia_topdir/lib/libqpe.${shlibext}; then
- if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
- ac_cv_path_qtopia_lib="-L$gnash_qtopia_topdir/lib -lqpe"
- break
- else
- ac_cv_path_qtopia_lib="-lqpe"
- break
- fi
- fi
- fi
- AC_MSG_RESULT(${ac_cv_path_qtopia_lib})
- fi
-
- AC_MSG_CHECKING([Sanity checking the Qtopia installation])
- dnl this a sanity check for Qtopia 2
- qt_libs="libqtopia libqpe"
- if test ${gnash_qtopia_version} -eq 2; then
- AC_DEFINE([GNASH_QTOPIA_VERSION], 2, [The Qtopia version])
- if test x"${ac_cv_path_qtopia_lib}" != x; then
- for i in $qt_libs; do
- if ! test -f ${gnash_qtopia_topdir}/lib/$i.${shlibext}; then
- AC_MSG_WARN([${gnash_qtopia_topdir}/lib/$i.${shlibext} not found!])
- qtopia_nogo=yes
- fi
- done
- fi
- fi
-
- dnl this a sanity check for Qtopia 4
- qt_libs="libqtopia libqtopiabase"
- if test ${gnash_qtopia_version} -eq 4; then
- AC_DEFINE([GNASH_QTOPIA_VERSION], 4, [The Qtopia version])
- gnash_qtopia_version=`dirname ${gnash_qtopia_topdir}`
- if test x"${ac_cv_path_qtopia_lib}" != x; then
- for i in $qt_libs; do
- if ! test -f ${gnash_qtopia_topdir}/lib/$i.${shlibext}; then
- AC_MSG_WARN([${gnash_qtopia_topdir}/lib/$i${shlibext} not found!])
- qtopia_nogo=yes
- fi
- done
- fi
- fi
- if test x"${qtopia_nogo}" = xyes; then
- AC_MSG_ERROR([Broken Qtopia library installation!])
- else
- AC_MSG_RESULT([fine])
- fi
-
- if test x"${ac_cv_path_qtopia_lib}" = x; then
- AC_CHECK_LIB(qtopia-${gnash_qtopia_version},
qtopia_engine_shape_class_init, [ac_cv_path_qtopia_lib="-lqtopia"])
- fi
-
- if test x"${ac_cv_path_qtopia_incl}" != x; then
- QTOPIA_CFLAGS="${ac_cv_path_qtopia_incl}"
- else
- QTOPIA_CFLAGS=""
- fi
-
- if test x"${ac_cv_path_qtopia_lib}" != x; then
- QTOPIA_LIBS="${ac_cv_path_qtopia_lib}"
- AC_DEFINE(HAVE_QTOPIA, 1, [has the Qtopia framework])
- has_qtopia="yes"
- else
- QTOPIA_LIBS=""
- fi
-
- AC_SUBST(QTOPIA_CFLAGS)
- AC_SUBST(QTOPIA_LIBS)
-])
-
-# Local Variables:
-# c-basic-offset: 2
-# tab-width: 2
-# indent-tabs-mode: nil
-# End:
http://git.savannah.gnu.org/cgit//commit/?id=d2131f13a11618d1d5c8aae7417fe71b511bdea8
commit d2131f13a11618d1d5c8aae7417fe71b511bdea8
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 14 13:17:23 2011 +0100
Remove unneeded conditional.
diff --git a/libbase/SharedMem.cpp b/libbase/SharedMem.cpp
index d339fc4..7ce7594 100644
--- a/libbase/SharedMem.cpp
+++ b/libbase/SharedMem.cpp
@@ -36,7 +36,7 @@
#include "log.h"
-#if (defined(USE_SYSV_SHM) && defined(HAVE_SHMGET))
+#if (defined(HAVE_SHMGET))
# define ENABLE_SHARED_MEM 1
#else
# undef ENABLE_SHARED_MEM
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 145 +++-------------------------------
libbase/SharedMem.cpp | 2 +-
macros/qtopia.m4 | 208 -------------------------------------------------
3 files changed, 14 insertions(+), 341 deletions(-)
delete mode 100644 macros/qtopia.m4
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-275-g89aa145,
Benjamin Wolsey <=