[Gnash-commit] gnash ChangeLog configure.ac gui/gnash.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/18 11:16:57

Modified files:
        .              : ChangeLog configure.ac 
        gui            : gnash.cpp 

Log message:
                * configure.ac: check for getopt.h
                * gui/gnash.cpp: don't redeclare geopt stuff is getopt.h
                  is available.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1284&r2=1.1285
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1284
retrieving revision 1.1285
diff -u -b -r1.1284 -r1.1285
--- ChangeLog   18 Oct 2006 10:48:47 -0000      1.1284
+++ ChangeLog   18 Oct 2006 11:16:56 -0000      1.1285
@@ -1,5 +1,8 @@
 2006-10-18 Sandro Santilli <address@hidden>
 
+       * configure.ac: check for getopt.h
+       * gui/gnash.cpp: don't redeclare geopt stuff is getopt.h
+         is available.
        * macros/sdl.m4: fixed typo ("$/" => "$i/")
 
 2006-10-18 Bastiaan Jacques <address@hidden>

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- configure.ac        18 Oct 2006 10:34:02 -0000      1.170
+++ configure.ac        18 Oct 2006 11:16:57 -0000      1.171
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.170 2006/10/18 10:34:02 bjacques Exp $
+dnl $Id: configure.ac,v 1.171 2006/10/18 11:16:57 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -365,6 +365,7 @@
 AC_PATH_XTRA
 AC_CHECK_HEADERS(dejagnu.h)
 AC_CHECK_HEADERS(malloc.h)
+AC_CHECK_HEADERS(getopt.h)
 
 dnl seems unused
 dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gui/gnash.cpp       17 Oct 2006 22:29:51 -0000      1.51
+++ gui/gnash.cpp       18 Oct 2006 11:16:57 -0000      1.52
@@ -48,10 +48,14 @@
 #else
 extern "C"{
         #include <unistd.h>
+#ifdef HAVE_GETOPT_H
+       #include <getopt.h>
+#else
         extern int optind, getopt(int, char *const *, const char *);
        extern char *optarg; // global argument pointer
+#endif
 }
-#endif // Win32
+#endif // ! Win32
 
 
 #include <iostream>