--- configure.orig	2008-04-07 06:31:31.000000000 +0200
+++ configure	2008-04-16 20:55:32.000000000 +0200
@@ -3505,7 +3505,7 @@
 fi
 
 
-if test "$GXX" = "yes" && expr "$CXXFLAGS" : '.*-O' > /dev/null
+if test "$GXX" = "yes" && expr -- "$CXXFLAGS" : '.*-O' > /dev/null
 then
   CXXFLAGS="$CXXFLAGS -fno-exceptions"
 fi
@@ -18179,7 +18179,7 @@
   CURSES_LIB=-lncurses
 
 cat >>confdefs.h <<\_ACEOF
-#define CURSES_HEADER <ncurses/curses.h>
+#define CURSES_HEADER <ncurses/ncurses.h>
 _ACEOF
 
 else
@@ -18366,8 +18366,8 @@
      if test "$enable_wide_curses" != "no"
      then
 
-       { echo "$as_me:$LINENO: checking for wide character support in curses libraray" >&5
-echo $ECHO_N "checking for wide character support in curses libraray... $ECHO_C" >&6; }
+       { echo "$as_me:$LINENO: checking for wide character support in curses library" >&5
+echo $ECHO_N "checking for wide character support in curses library... $ECHO_C" >&6; }
        if test -n "$have_mblen"
        then
          cat >conftest.$ac_ext <<_ACEOF