[Gnash-commit] gnash ChangeLog macros/curl.m4 macros/sdl.m4 ma...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/11 14:20:01

Modified files:
        .              : ChangeLog 
        macros         : curl.m4 sdl.m4 x11.m4 

Log message:
                * macros/curl.m4, sdl.m4: Drop extraneous results.
                * macros/x11.m4: Remove --enable test, remove extraneous 
results.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3167&r2=1.3168
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3167
retrieving revision 1.3168
diff -u -b -r1.3167 -r1.3168
--- ChangeLog   11 May 2007 13:39:45 -0000      1.3167
+++ ChangeLog   11 May 2007 14:20:00 -0000      1.3168
@@ -1,3 +1,8 @@
+2007-05-11  Rob Savoye  <address@hidden>
+
+       * macros/curl.m4, sdl.m4: Drop extraneous results.
+       * macros/x11.m4: Remove --enable test, remove extraneous results.
+
 2007-05-11 Sandro Santilli <address@hidden>
 
        * server/dlist.h (move_display_object): document the call to

Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- macros/curl.m4      8 Apr 2007 23:06:17 -0000       1.15
+++ macros/curl.m4      11 May 2007 14:20:00 -0000      1.16
@@ -14,7 +14,7 @@
 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 $Id: curl.m4,v 1.15 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: curl.m4,v 1.16 2007/05/11 14:20:00 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_CURL],
 [
@@ -46,8 +46,6 @@
 
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_curl_incl}" = x; then
-
-    AC_MSG_CHECKING([for libcurl header])
     if test x"${curlconfig}" != "x"; then
       ac_cv_path_curl_incl=`${curlconfig} --cflags`
     else
@@ -63,6 +61,7 @@
       AC_CHECK_HEADERS(curl/curl.h)
     fi
 
+    AC_MSG_CHECKING([for libcurl header])
     if test x"${ac_cv_path_curl_incl}" != x ; then
       AC_MSG_RESULT(yes)
     else

Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- macros/sdl.m4       8 Apr 2007 23:06:17 -0000       1.39
+++ macros/sdl.m4       11 May 2007 14:20:00 -0000      1.40
@@ -14,7 +14,7 @@
 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 $Id: sdl.m4,v 1.39 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: sdl.m4,v 1.40 2007/05/11 14:20:00 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_SDL], [
   has_sdl=no
@@ -75,7 +75,6 @@
       done
     done
   fi
-  AC_MSG_RESULT(${ac_cv_path_sdl_incl})
  
   SDL_CFLAGS=""
   if test x"${ac_cv_path_sdl_incl}" = x ; then

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/x11.m4       28 Apr 2007 00:04:26 -0000      1.6
+++ macros/x11.m4       11 May 2007 14:20:00 -0000      1.7
@@ -15,18 +15,10 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.6 2007/04/28 00:04:26 rsavoye Exp $
+dnl $Id: x11.m4,v 1.7 2007/05/11 14:20:00 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
-  AC_ARG_ENABLE(x11, AC_HELP_STRING([--disable-x11], [Disable support for 
X11]),
-  [case "${enableval}" in
-    yes) x11=yes ;;
-    no)  x11=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for enable-x11 option]) ;;
-  esac], x11=yes)
-
-  if test x"$x11" = x"yes"; then
   dnl Look for the header
     AC_ARG_WITH(x11_incl, AC_HELP_STRING([--with-x11-incl], [Directory where 
x11 header is]), with_x11_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_x11_incl, [
@@ -41,17 +33,10 @@
 
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_x11_incl}" = x; then
-      AC_MSG_CHECKING([for X11 headers])
       newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${incllist}"
       for i in $newlist; do
        if test -f $i/X11/X.h; then
-         if test x"$i" != x"/usr/include"; then
            ac_cv_path_x11_incl="-I$i"
-           break
-          else
-           ac_cv_path_x11_incl=""
-           break
-         fi
        fi
       done
     fi
@@ -60,14 +45,13 @@
       AC_CHECK_HEADERS(X11/X.h, [ac_cv_path_x11_incl=""])
     fi
 
-    AC_MSG_RESULT(${ac_cv_path_x11_incl})
-
-
+  AC_MSG_CHECKING([for X11 headers])
     if test x"${ac_cv_path_x11_incl}" != x ; then
       X11_CFLAGS="${ac_cv_path_x11_incl}"
       AC_MSG_RESULT(${ac_cv_path_x11_incl})
     else
       X11_CFLAGS=""
+    AC_MSG_RESULT(none)
     fi
 
     dnl Look for the library
@@ -84,7 +68,6 @@
 
     dnl If the header doesn't exist, there is no point looking for the library.
     if test x"${ac_cv_path_x11_incl}" != x; then
-      AC_MSG_CHECKING([for X11 library])
       newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
       for i in $newlist; do
              if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
@@ -101,7 +84,6 @@
           if test -f $i/libICE.a -o -f $i/libICE.${shlibext}; then
             ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lICE"
           fi
-          AC_MSG_RESULT(yes)
           break
         fi
       done
@@ -116,20 +98,15 @@
 
     if test x"${ac_cv_path_x11_lib}" = x; then
       AC_CHECK_LIB(X11, x11_mem_init, [ac_cv_path_x11_lib=""])
-      AC_MSG_RESULT(${ac_cv_path_x11_lib})
     fi
 
+  AC_MSG_CHECKING([for X11 library])
     if test x"${ac_cv_path_x11_lib}" != x ; then
       X11_LIBS="${ac_cv_path_x11_lib}"
+    AC_MSG_RESULT(${ac_cv_path_x11_lib})
     else
       X11_LIBS=""
-    fi
-  fi
-
-  if test x"${ac_cv_path_x11_lib}" != x ; then
-      X11_LIBS="${ac_cv_path_x11_lib}"
-  else
-      X11_LIBS="-lX11"
+    AC_MSG_RESULT(none)
   fi
 
   AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])