From: <fr...@us...> - 2011-03-27 11:17:03
|
Revision: 4324 http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4324&view=rev Author: fredm Date: 2011-03-27 11:16:57 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Move windres detection into the Win32 UI block (works around bug #3248008; thanks, Cygnus). Modified Paths: -------------- trunk/fuse/configure.in trunk/fuse/hacking/ChangeLog Modified: trunk/fuse/configure.in =================================================================== --- trunk/fuse/configure.in 2011-03-27 11:05:46 UTC (rev 4323) +++ trunk/fuse/configure.in 2011-03-27 11:16:57 UTC (rev 4324) @@ -37,23 +37,6 @@ AC_PROG_YACC AC_PROG_LIBTOOL -dnl Check for Win32 resource tool -AC_CHECK_TOOL(WINDRES, windres, no) -AC_SUBST(WINDRES) -if test "$WINDRES" != no; then - WINDRES_OBJ="windres.o" - define(FUSE_FULL_VERSION, - [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]], - translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]], - [FUSE_VERSION])])dnl - AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable]) - FUSE_FULL[]_VERSION=FUSE_FULL_VERSION - AC_SUBST(FUSE_FULL[]_VERSION) - AM_SUBST_NOTMAKE(FUSE_FULL[]_VERSION) -fi -AC_SUBST(WINDRES_OBJ) -AM_SUBST_NOTMAKE(WINDRES_OBJ) - dnl Generate commandy.h YFLAGS="$YFLAGS -d" AC_SUBST(YFLAGS) @@ -102,6 +85,19 @@ win32=no) AC_MSG_RESULT($win32) if test "$win32" = yes; then + AC_CHECK_TOOL(WINDRES, windres, no) + AC_SUBST(WINDRES) + if test "$WINDRES" != no; then + WINDRES_OBJ="windres.o" + define(FUSE_FULL_VERSION, + [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]], + translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]], + [FUSE_VERSION])])dnl + AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable]) + FUSE_FULL[]_VERSION=FUSE_FULL_VERSION + AC_SUBST(FUSE_FULL[]_VERSION) + AM_SUBST_NOTMAKE(FUSE_FULL[]_VERSION) + fi AC_CHECK_HEADER(windows.h, LIBS="$LIBS -mwindows -lcomctl32 -lwinmm"; AC_DEFINE([UI_WIN32], 1, [Defined if Win32 UI in use]) @@ -110,6 +106,8 @@ UI=win32; UI_LIBS="ui/win32/libuiwin32.a", AC_MSG_ERROR([Win32 UI not found])) fi +AC_SUBST(WINDRES_OBJ) +AM_SUBST_NOTMAKE(WINDRES_OBJ) dnl Look for svgalib (default=no) AC_MSG_CHECKING(whether svgalib UI requested) Modified: trunk/fuse/hacking/ChangeLog =================================================================== --- trunk/fuse/hacking/ChangeLog 2011-03-27 11:05:46 UTC (rev 4323) +++ trunk/fuse/hacking/ChangeLog 2011-03-27 11:16:57 UTC (rev 4324) @@ -3547,3 +3547,5 @@ mismatch next OP if the top OP was 2 bytes. - Enabled ESC key to close the dialog. (patch #3201532) (Sergio Baldovi). +20110327 configure.in: move windres detection into the Win32 UI block (works + around bug #3248008; thanks, Cygnus). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |