From cad61e94d4031b3190c0edb51465757868cfd0cd Mon Sep 17 00:00:00 2001 From: Michael Schumacher Date: Sun, 1 Aug 2004 16:26:20 +0000 Subject: [PATCH] move an AM_CONDITIONAL out of an if block 2004-08-01 Michael Schumacher * configure.in: move an AM_CONDITIONAL out of an if block --- ChangeLog | 6 +++++- configure.in | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cdeb0d74b..fdee86e97a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ +2004-08-01 Michael Schumacher + + * configure.in: move an AM_CONDITIONAL out of an if block + 2004-08-01 Michael Schumacher * configure.in: added checks for windres. Fixes bug #148443 - together will my last commit. + together with my last commit. 2004-08-01 Michael Schumacher diff --git a/configure.in b/configure.in index 31dc27d4bc..012ba221da 100644 --- a/configure.in +++ b/configure.in @@ -245,11 +245,10 @@ AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") if test "$os_win32" = "yes"; then AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) AC_CHECK_TOOL(WINDRES, windres, :) - AC_MSG_RESULT([$windres]) - AM_CONDITIONAL(HAVE_WINDRES, test "$windres" != ":") + AC_MSG_RESULT([$windres]) fi AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) - +AM_CONDITIONAL(HAVE_WINDRES, test "$windres" != ":") ############### # Generic stuff