[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4323] trunk/libspectrum

[<fr...@us...>]

Revision: 4323
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4323&view=rev
Author:   fredm
Date:     2011-03-27 11:05:46 +0000 (Sun, 27 Mar 2011)

Log Message:
-----------
Allow the user to say they do not want to use windres (works around bug
#3248008; thanks, Cygnus).

Modified Paths:
--------------
    trunk/libspectrum/configure.in
    trunk/libspectrum/hacking/ChangeLog

Modified: trunk/libspectrum/configure.in
===================================================================
--- trunk/libspectrum/configure.in	2011-03-20 18:06:00 UTC (rev 4322)
+++ trunk/libspectrum/configure.in	2011-03-27 11:05:46 UTC (rev 4323)
@@ -53,17 +53,25 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-dnl Check for Win32 resource tool
-AC_CHECK_TOOL(WINDRES, windres, no)
-AC_SUBST(WINDRES)
-if test "$WINDRES" != no; then
-  WINDRES_OBJ="windres.o"
-  WINDRES_LDFLAGS="-Xlinker windres.o"
-  define(LIBSPECTRUM_FULL_VERSION,
-         [ifelse(translit(LIBSPECTRUM_VERSION, [0-9]), [.], [LIBSPECTRUM_VERSION[.0.0]],
-                 translit(LIBSPECTRUM_VERSION, [0-9]), [..], [LIBSPECTRUM_VERSION[.0]],
-                 [LIBSPECTRUM_VERSION])])dnl
-  AC_DEFINE([VERSION_WIN32], [translit(LIBSPECTRUM_FULL_VERSION, [.], [,])], [Define version information for win32 dll library])
+dnl Check whether to use Windows resource file utility
+AC_MSG_CHECKING(whether to use windres)
+AC_ARG_WITH(windres,
+[  --without-windres       don't use windres],
+if test "$withval" = no; then windres=no; else windres=yes; fi,
+windres=yes)
+AC_MSG_RESULT($windres)
+if test "$windres" = yes; then
+  AC_CHECK_TOOL(WINDRES, windres, no)
+  AC_SUBST(WINDRES)
+  if test "$WINDRES" != no; then
+    WINDRES_OBJ="windres.o"
+    WINDRES_LDFLAGS="-Xlinker windres.o"
+    define(LIBSPECTRUM_FULL_VERSION,
+           [ifelse(translit(LIBSPECTRUM_VERSION, [0-9]), [.], [LIBSPECTRUM_VERSION[.0.0]],
+                   translit(LIBSPECTRUM_VERSION, [0-9]), [..], [LIBSPECTRUM_VERSION[.0]],
+                   [LIBSPECTRUM_VERSION])])dnl
+    AC_DEFINE([VERSION_WIN32], [translit(LIBSPECTRUM_FULL_VERSION, [.], [,])], [Define version information for win32 dll library])
+  fi
 fi
 AC_SUBST(WINDRES_OBJ)
 AM_SUBST_NOTMAKE(WINDRES_OBJ)

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2011-03-20 18:06:00 UTC (rev 4322)
+++ trunk/libspectrum/hacking/ChangeLog	2011-03-27 11:05:46 UTC (rev 4323)
@@ -805,3 +805,5 @@
          Mitchell).
 20110131 sna.c,z80.c: note info loss of SpecDrum info when writing sna or z80
          format snapshots (Fred).
+20110327 configure.in: allow the user to say they do not want to use windres
+         (works around bug #3248008; thanks, Cygnus).


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.