diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-12-27 08:04:31 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-12-27 08:04:31 +0000 |
| commit | bdcc354cda8859b86fea45e28419cf44ec42cd3b (patch) | |
| tree | f08b34961f20e48c9ce1a56f931723a8bf114e7e | |
| parent | 9470faf3fa4ba93ba028afa1c4f288cd221fc58a (diff) | |
don't enable windres on non-win32 platforms.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1946 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2007-12-27 + + * configure.in + src/Makefile.am: don't enable windres on non-win32 platforms. + 2007-12-21 * version 2.4.8 diff --git a/ChangeLog.ja b/ChangeLog.ja index 6d97e8f1..046858c1 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,9 @@ +2007-12-27 + + * configure.in + src/Makefile.am: win32 以外のプラットフォームで windres を有効に + しないようにした。 + 2007-12-21 * version 2.4.8 diff --git a/configure.in b/configure.in index e2e8f4bc..90394137 100644 --- a/configure.in +++ b/configure.in @@ -56,9 +56,6 @@ AM_PROG_LEX AC_PROG_YACC AM_PROG_LIBTOOL -AC_CHECK_PROG(WINDRES, windres, windres) -AM_CONDITIONAL(HAVE_WINDRES, test x"$WINDRES" != x) - SYLPHEED_ACLOCAL_INCLUDE(ac) native_win32=no @@ -71,9 +68,12 @@ case "$target" in native_win32=yes CFLAGS="$CFLAGS -mms-bitfields -mwindows" LIBS="$LIBS -lws2_32" + AC_CHECK_PROG(WINDRES, windres, windres) ;; esac +AM_CONDITIONAL(NATIVE_WIN32, test "$native_win32" = "yes") + dnl Checks for libraries. AM_PATH_GLIB_2_0(2.4.0,, AC_MSG_ERROR(Test for GLib failed. See the 'INSTALL' for help.)) diff --git a/src/Makefile.am b/src/Makefile.am index 47902071..15ab682c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,10 +112,8 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir)/libsylph -if HAVE_WINDRES +if NATIVE_WIN32 SYLPHEED_RES = sylpheed.res -#sylpheed.rc: -# echo "SYLPHEED ICON icons/sylpheed.ico" >$@ sylpheed.res: sylpheed.rc $(WINDRES) $< -O coff -o $@ else |