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

[<sba...@us...>]

Revision: 4778
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4778&view=rev
Author:   sbaldovi
Date:     2012-11-28 23:21:34 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Don't check for windres when not building for Windows hosts. Remove --without-windres option, previously used as a workaround (Sergio).

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

Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac	2012-11-26 23:35:48 UTC (rev 4777)
+++ trunk/libspectrum/configure.ac	2012-11-28 23:21:34 UTC (rev 4778)
@@ -46,6 +46,7 @@
 AC_CONFIG_SRCDIR([libspectrum.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
+AC_CANONICAL_HOST
 
 dnl Use automake to produce `Makefile.in'
 AM_INIT_AUTOMAKE
@@ -68,12 +69,12 @@
 AC_PROG_CC
 
 dnl Setup for compiling build tools (make-perl)
-AC_MSG_CHECKING([for a C compiler for build tools])
 if test $cross_compiling = yes; then
   AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
 else
   CC_FOR_BUILD=$CC
 fi
+AC_MSG_CHECKING([for a C compiler for build tools])
 AC_MSG_RESULT([$CC_FOR_BUILD])
 AC_SUBST(CC_FOR_BUILD)
 
@@ -88,21 +89,18 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-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"
-  fi
-fi
+dnl Check for host specific programs
+WINDRES_OBJ=
+WINDRES_LDFLAGS=
+case "$host_os" in
+  mingw32*)
+    AC_CHECK_TOOL([WINDRES], [windres], [no])
+    if test "$WINDRES" != no; then
+      WINDRES_OBJ="windres.o"
+      WINDRES_LDFLAGS="-Xlinker windres.o"
+    fi
+    ;;
+esac
 AC_SUBST(WINDRES_OBJ)
 AC_SUBST(WINDRES_LDFLAGS)
 

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2012-11-26 23:35:48 UTC (rev 4777)
+++ trunk/libspectrum/hacking/ChangeLog	2012-11-28 23:21:34 UTC (rev 4778)
@@ -900,5 +900,8 @@
          (thanks, clang 4.1) (Fred).
 20121107 libspectrum.c: fix potential leak of memory pointed to by
          'new_filename' (thanks, clang 4.1) (Fred).
-20121126 memory.c,myglib/garray.c,windres.rc: fix harcoded Id tags and add
+20121126 memory.c,myglib/garray.c,windres.rc: fix hard-coded Id tags and add
          missing properties (Sergio).
+20121129 configure.ac: don't check for windres when not building for Windows
+         hosts. Remove --without-windres option, previously used as a workaround
+         (Sergio).

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