[Gnash-commit] gnash ChangeLog configure.ac [release-0-8-0]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Sandro Santilli <strk>  07/06/06 14:54:39

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        backport:
                * configure.ac: don't set CXXFLAGS as a side-effect of the 
SIZET_FMT
                  tests if not already set by user. Back to using AC_TRY_RUN, 
btw,
                  till we find a better solution.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.24&r2=1.3451.2.25
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.331.4.3&r2=1.331.4.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.24
retrieving revision 1.3451.2.25
diff -u -b -r1.3451.2.24 -r1.3451.2.25
--- ChangeLog   6 Jun 2007 14:50:35 -0000       1.3451.2.24
+++ ChangeLog   6 Jun 2007 14:54:37 -0000       1.3451.2.25
@@ -1,5 +1,11 @@
 2007-06-06 Sandro Santilli <address@hidden>
 
+        * configure.ac: don't set CXXFLAGS as a side-effect of the SIZET_FMT
+         tests if not already set by user. Back to using AC_TRY_RUN, btw,
+         till we find a better solution.
+
+2007-06-06 Sandro Santilli <address@hidden>
+
         * configure.ac: If no --enable-media was specified, use the first
           detected one in this order: ffmpeg/gst/mad. This is to allow
           ./configure with no args to be more failsafe (useful on 'make

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.331.4.3
retrieving revision 1.331.4.4
diff -u -b -r1.331.4.3 -r1.331.4.4
--- configure.ac        6 Jun 2007 14:50:36 -0000       1.331.4.3
+++ configure.ac        6 Jun 2007 14:54:38 -0000       1.331.4.4
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.331.4.3 2007/06/06 14:50:36 strk Exp $
+dnl $Id: configure.ac,v 1.331.4.4 2007/06/06 14:54:38 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -61,39 +61,45 @@
 
 dnl AC_CHECK_SIZEOF([size_t], 4, AC_INCLUDES_DEFAULT)
 
-AC_DEFINE(SIZET_FMT, ["%ud"], [size_t printf modifier is ud])
+dnl NOTE: Using AC_TRY_COMPILE is bogus when cross-compiling !
+dnl       We need to know the size of size_t in the *target* host, 
+dnl       not the build host (right?)
+dnl
+AC_LANG_PUSH(C++)
+save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -Werror -Wformat"
+
+AC_TRY_COMPILE([#include <sys/types.h>
+  #include <stdio.h>], [
+  size_t num = 0;
+  printf("%d", num); ],
+  AC_DEFINE(SIZET_FMT, ["%d"], [size_t printf modifier is d])
+)
+AC_TRY_COMPILE([#include <sys/types.h>
+  #include <stdio.h>], [
+  size_t num = 0;
+  printf("%u", num); ],
+   AC_DEFINE(SIZET_FMT, ["%u"], [size_t printf modifier is u])
+)
+AC_TRY_COMPILE([#include <sys/types.h>
+  #include <stdio.h>], [
+  size_t num = 0;
+  printf("%lu", num); ],
+  AC_DEFINE(SIZET_FMT, ["%lu"], [size_t printf modifier is lu])
+)
+AC_TRY_COMPILE([#include <sys/types.h> 
+  #include <stdio.h>], [
+  size_t num = 0;
+  printf("%ld", num); ],
+  AC_DEFINE(SIZET_FMT, ["%ld"], [size_t printf modifier is ld])
+)
 
-#AC_LANG_PUSH(C++)
-#save_CXXFLAGS="$CXXFLAGS"
-#CXXFLAGS="$CXXFLAGS -Werror -Wformat"
-#
-#AC_TRY_COMPILE([#include <sys/types.h>
-#  #include <stdio.h>], [
-#  size_t num = 0;
-#  printf("%d", num); ],
-#  AC_DEFINE(SIZET_FMT, ["%d"], [size_t printf modifier is d])
-#)
-#AC_TRY_COMPILE([#include <sys/types.h>
-#  #include <stdio.h>], [
-#  size_t num = 0;
-#  printf("%u", num); ],
-#   AC_DEFINE(SIZET_FMT, ["%u"], [size_t printf modifier is u])
-#)
-#AC_TRY_COMPILE([#include <sys/types.h>
-#  #include <stdio.h>], [
-#  size_t num = 0;
-#  printf("%lu", num); ],
-#  AC_DEFINE(SIZET_FMT, ["%lu"], [size_t printf modifier is lu])
-#)
-#AC_TRY_COMPILE([#include <sys/types.h> 
-#  #include <stdio.h>], [
-#  size_t num = 0;
-#  printf("%ld", num); ],
-#  AC_DEFINE(SIZET_FMT, ["%ld"], [size_t printf modifier is ld])
-#)
-#
-#CXXFLAGS="$save_CXXFLAGS"
-#AC_LANG_POP(C++)
+if test x"$ac_env_CXXFLAGS_set" = "xset"; then
+       CXXFLAGS="$save_CXXFLAGS"
+else
+       unset CXXFLAGS; 
+fi
+AC_LANG_POP(C++)
 
 dnl This is primarily used when compiling for a similar architecture,
 dnl like pentium->geode, which can use the same compiler, but have