diff --git a/configure b/configure
index 3d5aebc3e..c2a0ab676 100755
--- a/configure
+++ b/configure
@@ -585,7 +585,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 V_MAJOR=1
 V_MINOR=0
 V_REV=7
-V_EXTRA=
+V_EXTRA=-cvs
 
 PACKAGE=sane-backends
 VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}${V_EXTRA}
@@ -1464,7 +1464,7 @@ else
 fi
 
   case "${host_os}" in  
-    solaris*)
+    solaris* | hpux*)
       ANSI_FLAG=
       ;;
   esac
@@ -1502,7 +1502,7 @@ esac
       fi
     
 else
-  if false; then # release (false) or development (true)
+  if true; then # release (false) or development (true)
        # Warnings enabled by default (development)
        for flag in $WARN_CFLAGS; do
          case "$CFLAGS" in
diff --git a/configure.in b/configure.in
index f15a41ed6..337fcac8e 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_ARG_PROGRAM
 V_MAJOR=1
 V_MINOR=0
 V_REV=7
-V_EXTRA=
+V_EXTRA=-cvs
 
 PACKAGE=sane-backends
 VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}${V_EXTRA}
@@ -63,7 +63,7 @@ if test "${ac_cv_prog_gcc}" = "yes"; then
   ANSI_FLAG=-ansi
   AC_CHECK_HEADER(os2.h,[ANSI_FLAG=],)
   case "${host_os}" in  
-    solaris*)
+    solaris* | hpux*)
       ANSI_FLAG=
       ;;
   esac
@@ -84,7 +84,7 @@ if test "${ac_cv_prog_gcc}" = "yes"; then
         done
       fi
     ],
-    [if false; then # release (false) or development (true)
+    [if true; then # release (false) or development (true)
        # Warnings enabled by default (development)
        for flag in $WARN_CFLAGS; do
          JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])