[Gnash-commit] gnash configure.ac ChangeLog macros/lirc.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/09/13 19:32:50

Modified files:
        .              : configure.ac ChangeLog 
Added files:
        macros         : lirc.m4 

Log message:
                * macros/lirc.m4: Search for lirc files, so we can support a
                remote control.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lirc.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.414&r2=1.415
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4308&r2=1.4309

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -b -r1.414 -r1.415
--- configure.ac        13 Sep 2007 18:33:19 -0000      1.414
+++ configure.ac        13 Sep 2007 19:32:49 -0000      1.415
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.414 2007/09/13 18:33:19 bwy Exp $
+dnl $Id: configure.ac,v 1.415 2007/09/13 19:32:49 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -26,6 +26,17 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
+dnl --------------------------------------------------------
+dnl Figure out development tool stuff
+dnl --------------------------------------------------------
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_EXEEXT
+AC_PROG_INSTALL
+AM_COMPILER_LIB
+
+
 dnl Set the default values for Flash Version. These are converted into
 dnl various strings to make JavaScript or ActionScript detectors
 dnl recognize Gnash as a Flash Player.
@@ -37,11 +48,12 @@
 case "${host}" in
   powerpc-apple-darwin*)
     AC_DEFINE([__powerpc64__], [], [this is a 64 bit powerpc])
+    darwin=yes
     ;;
-  i[34567]86-apple-darwin*)
+  i*86-apple-darwin*)
     darwin=yes
     ;;
-  i[34567]86-*-openbsd*)
+  i*86-*-openbsd*)
     openbsd_os=openbsd
     ;;
   *64-*-openbsd*)
@@ -104,11 +116,7 @@
   AC_DEFINE(SIZET_FMT, ["%ld"], [size_t printf modifier is ld])
 )
 
-if test x"$ac_env_CXXFLAGS_set" = "xset"; then
-       CXXFLAGS="$save_CXXFLAGS"
-else
-       unset CXXFLAGS; 
-fi
+CXXFLAGS="$save_CXXFLAGS"
 AC_LANG_POP(C++)
 
 dnl This is primarily used when compiling for a similar architecture,
@@ -361,24 +369,24 @@
       all)
         # allow special value "all" set by user (handled below)
         ;; 
-      rgba32|RGBA32)
-        AC_DEFINE(PIXELFORMAT_RGBA32, [1], [RGBA32])
-        ;;
-      bgra32|BGRA32)
-        AC_DEFINE(PIXELFORMAT_BGRA32, [1], [BGRA32])
-        ;;
       argb32|ARGB32)
         AC_DEFINE(PIXELFORMAT_ARGB32, [1], [ARGB32])
         ;;
       abgr32|ABGR32)
         AC_DEFINE(PIXELFORMAT_ABGR32, [1], [ABGR32])
         ;;
-      rgb24|RGB24)
-        AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24])
+      bgra32|BGRA32)
+        AC_DEFINE(PIXELFORMAT_BGRA32, [1], [BGRA32])
         ;;
       bgr24|BGR24)
         AC_DEFINE(PIXELFORMAT_BGR24, [1], [BGR24])
         ;;
+      rgba32|RGBA32)
+        AC_DEFINE(PIXELFORMAT_RGBA32, [1], [RGBA32])
+        ;;
+      rgb24|RGB24)
+        AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24])
+        ;;
       rgb555|RGB555)
         AC_DEFINE(PIXELFORMAT_RGB555, [1], [RGB555])
         ;;
@@ -468,6 +476,8 @@
 ext_mysql=no
 ext_fileio=no
 ext_gtk=no
+ext_lirc=no
+ext_dbus=no
 ext_all=no
 AC_ARG_WITH(extensions,
   AC_HELP_STRING([--with-extensions=], [Specify which extensions to build]),
@@ -508,16 +518,28 @@
         ext_gtk=yes
         nextensions=$((nextensions+1))
         ;;
+      lirc|LIRC)
+        AC_DEFINE(USE_LIRC_EXT, [1], [Build the LIRC extension])
+        ext_lirc=yes
+        nextensions=$((nextensions+1))
+        ;;
+      dbus|DBUS)
+        AC_DEFINE(USE_DBUS_EXT, [1], [Build the DBUS extension])
+        ext_dbus=yes
+        nextensions=$((nextensions+1))
+        ;;
       all|ALL)
         AC_DEFINE(USE_GTK_EXT, [1], [Build all the extensions])
         ext_dejagnu=yes
         ext_mysql=yes
         ext_fileio=yes
         ext_gtk=yes
+        ext_lirc=no
+        ext_dbus=no
         ext_all=yes
         nextensions=5
         ;;
-      *) AC_MSG_ERROR([invalid extension specified: ${withval} given (accept: 
MYSQL|DEJAGNU|FILEIO|GTK|ALL)])
+      *) AC_MSG_ERROR([invalid extension specified: ${withval} given (accept: 
MYSQL|DEJAGNU|FILEIO|GTK|LIRC|DBUS|ALL)])
          ;;
       esac]
     withval=`echo ${withval} | cut -d ' ' -f 2-6`
@@ -536,19 +558,16 @@
 AM_CONDITIONAL(BUILD_FILEIO_EXT, [ test x$ext_fileio = xyes ])
 AM_CONDITIONAL(BUILD_MYSQL_EXT, [ test x$ext_mysql = xyes ])
 AM_CONDITIONAL(BUILD_GTK_EXT, [ test x$ext_gtk = xyes ])
+AM_CONDITIONAL(BUILD_LIRC_EXT, [ test x$ext_lirc = xyes ])
+AM_CONDITIONAL(BUILD_DBUS_EXT, [ test x$ext_dbus = xyes ])
 if test x$ext_mysql = xyes; then
   GNASH_PATH_MYSQL
 fi
 
-dnl --------------------------------------------------------
-dnl Figure out development tool stuff
-dnl --------------------------------------------------------
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_EXEEXT
-AC_PROG_INSTALL
-AM_COMPILER_LIB
+dnl force lirc to be enabled
+if test x"${ext_lirc}" = x"yes"; then
+  lirc=yes
+fi
 
 AC_LIBLTDL_INSTALLABLE
 AC_LIBTOOL_DLOPEN
@@ -559,7 +578,6 @@
 AC_SUBST([LIBTOOL_DEPS])
 AC_LIB_LTDL
 
-
 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)
@@ -616,8 +634,6 @@
 dnl these same settings rather than duplicating them like we used to.
 dnl To override thise, use the --with-*-incl= and --with-*-libs=
 dnl options to configure.
-dnl
-dnl
 if test x$cross_compiling = xyes; then
   AC_MSG_NOTICE([Configuring Gnash for cross compilation])
   export pkgroot="`$CXX -print-search-dirs | grep "install:" | sed -e 
's/install: //' -e 's:/lib/gcc/.*::'`"
@@ -780,6 +796,10 @@
   ;;
 esac
 
+dnl Look for LIRC, which i sused if there is a remote control
+GNASH_PATH_LIRC
+AM_CONDITIONAL(LIRC, [test -n "$LIRC_LIBS"])
+
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(libgen.h)
@@ -953,7 +973,8 @@
 GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
 
 dnl Find freetype and fontconfig
-GNASH_PKG_FIND(freetype2, [freetype/freetype.h], [freetype2 font library], 
FT_Load_Char)
+dnl GNASH_PKG_FIND(freetype2, [freetype/freetype.h], [freetype2 font library], 
FT_Load_Char)
+GNASH_PATH_FREETYPE2
 GNASH_PKG_FIND(fontconfig, [fontconfig/fontconfig.h], [fontconfig library], 
FcFontMatch)
 
 if test x$cross_compiling = xno; then
@@ -1424,6 +1445,7 @@
 extensions/mysql/Makefile
 extensions/fileio/Makefile
 extensions/gtk2/Makefile
+extensions/lirc/Makefile
 plugin/Makefile
 plugin/klash/Makefile
 cygnal/Makefile
@@ -1947,6 +1969,22 @@
   echo "                 or .rpm users: yum install curl-devel"
 fi
 
+
+if test x"$LIRC_LIBS" != x; then
+  if test x"$LIRC_CFLAGS" != x; then
+    echo "        LIRC flags are: $LIRC_CFLAGS"
+  else
+    echo "        LIRC flags are: default include path"
+  fi
+    echo "        LIRC libs are: $LIRC_LIBS"
+else
+  echo "        WARNING: LIRC library not found."
+  echo "                 Gnash will be built without support for remote 
controls."
+  echo "                 Why not install liblirc from http://www.lirc.org";
+  echo "                 or .deb users: apt-get install lirc-dev"
+  echo "                 or .rpm users: yum install lirc-devel"
+fi
+
 if test x$build_agg = xyes; then # {
   echo "        AGG Pixel format is: $pixelformat"
     if test x"$AGG_LIBS" != x; then # {

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4308
retrieving revision 1.4309
diff -u -b -r1.4308 -r1.4309
--- ChangeLog   13 Sep 2007 18:33:19 -0000      1.4308
+++ ChangeLog   13 Sep 2007 19:32:49 -0000      1.4309
@@ -1,3 +1,8 @@
+2007-09-13  Rob Savoye  <address@hidden>
+
+       * macros/lirc.m4: Search for lirc files, so we can support a
+       remote control.
+
 2007-09-13 Benjamin Wolsey <address@hidden>
 
        * configure.ac, testsuite/misc-ming.all/Makefile.am: add conditional

Index: macros/lirc.m4
===================================================================
RCS file: macros/lirc.m4
diff -N macros/lirc.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ macros/lirc.m4      13 Sep 2007 19:32:49 -0000      1.1
@@ -0,0 +1,117 @@
+dnl  
+dnl    Copyright (C) 2005, 2006 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
+
+AC_DEFUN([GNASH_PATH_LIRC],
+[
+  dnl Look for the header
+  AC_ARG_WITH(lirc_incl, AC_HELP_STRING([--with-lirc-incl], [directory where 
Lirc header is (w/out the lirc/ prefix)]), with_lirc_incl=${withval})
+    AC_CACHE_VAL(ac_cv_path_lirc_incl,[
+    if test x"${with_lirc_incl}" != x ; then
+      if test -f ${with_lirc_incl}/lirc_client.h ; then
+             ac_cv_path_lirc_incl="-I`(cd ${with_lirc_incl}; pwd)`"
+      else
+             AC_MSG_ERROR([${with_lirc_incl} directory doesn't contain 
lirc/lirc.h])
+      fi
+    fi
+  ])
+
+  AC_ARG_WITH(lirc_lib, AC_HELP_STRING([--with-lirc-lib], [directory where 
lirc library is]), with_lirc_lib=${withval})
+    AC_CACHE_VAL(ac_cv_path_lirc_lib,[
+    if test x"${with_lirc_lib}" != x ; then
+      if test -f ${with_lirc_lib}/liblirc_client.a -o -f 
${with_lirc_lib}/liblirc_client.${shlibext}; then
+        ac_cv_path_lirc_lib="-L`(cd ${with_lirc_lib}; pwd)` -llirc_client"
+      else
+        AC_MSG_ERROR([${with_lirc_lib} directory doesn't contain liblirc.])
+      fi
+    fi
+  ])
+
+  AC_ARG_ENABLE(lirc, AC_HELP_STRING([--enable-lirc], [Enable support for 
Lirc]),
+  [case "${enableval}" in
+    yes) lirc=yes ;;
+    no)  lirc=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for enable-lirc option]) ;;
+  esac], lirc=no)
+
+  if test x"${lirc}" = x"yes"; then
+    dnl If the path hasn't been specified, go look for it.
+    if test x"${ac_cv_path_lirc_incl}" = x; then
+      for i in $incllist; do
+        if test -f $i/lirc/lirc_client.h; then
+          ac_cv_path_lirc_incl="-I$i"
+               break
+        fi
+      done
+
+      if test x"${ac_cv_path_lirc_incl}" = x ; then
+        AC_CHECK_HEADERS(lirc/lirc_client.h)
+      fi
+
+      AC_MSG_CHECKING([for Lirc header])
+      if test x"${ac_cv_path_lirc_incl}" != x ; then
+        AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+      fi
+    fi
+
+    dnl If the path hasn't been specified, go look for it.
+    if test x"${ac_cv_path_lirc_lib}" = x; then
+      dnl lirc-config gives us way to many libraries, which create nasty 
linking
+      dnl dependancy issue, so we strip them off here. The real dependencies 
are
+      dnl are taken care of by other config tests.
+      AC_MSG_CHECKING([for lirc_client library])
+      for i in $libslist; do
+        if test -f $i/liblirc_client.a -o -f $i/liblirc_client.${shlibext}; 
then
+          if test x"$i" != x"/usr/lib"; then
+            ac_cv_path_lirc_lib="-L$i -llirc_client"
+            AC_MSG_RESULT(${ac_cv_path_lirc_lib})
+            break
+          else
+            ac_cv_path_lirc_lib="-llirc_client"
+            AC_MSG_RESULT(yes)
+            break
+          fi
+        fi
+      done
+    fi
+
+    if test x"${ac_cv_path_lirc_incl}" != x ; then
+      if test x"${ac_cv_path_lirc_incl}" != x"/usr/include"; then
+        LIRC_CFLAGS="${ac_cv_path_lirc_incl}"
+      fi
+    else
+      LIRC_CFLAGS=""
+    fi
+
+    if test x"${ac_cv_path_lirc_lib}" != x ; then
+      if test x"${ac_cv_path_lirc_lib}" != x"/usr/lib"; then
+        LIRC_LIBS="${ac_cv_path_lirc_lib}"
+      fi
+    else
+      LIRC_LIBS=""
+    fi
+  fi
+
+  AC_SUBST(LIRC_CFLAGS)
+  AC_SUBST(LIRC_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End: