[1.0.17-1 release]

[hildon] / configure.ac

diff --git a/configure.ac b/configure.ac
index 568eac4..e9d53d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Hildon gtk widgets], [1.0.6], [michael.kostrzewa@nokia.com], [hildon])
+AC_INIT([Hildon gtk widgets], [1.0.17], [michael.kostrzewa@nokia.com], [hildon])
 AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
@@ -21,7 +21,7 @@ AS_VERSION
 #    increment current, and set revision to 0.
 # 5. If any interfaces have been added since the last public release, then increment age.
 # 6. If any interfaces have been removed since the last public release, then set age to 0.  
-AS_LIBTOOL(HILDON, 6, 0, 6)
+AS_LIBTOOL(HILDON, 17, 0, 17)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
@@ -134,11 +134,31 @@ else
     ASSERT_CFLAGS="-DG_DISABLE_ASSERT"
 fi
 
+# build with relaxed flags or not
+AC_ARG_ENABLE(fatal, 
+    AC_HELP_STRING([--enable-fatal], [Build with fatal warnings]),
+    [
+     case "${enableval}" in
+         yes) BUILD_WITH_FATAL=yes ;;
+         no)  BUILD_WITH_FATAL=no ;;
+         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-fatal) ;;
+     esac],
+     [BUILD_WITH_FATAL=no])
+
+# just print out our status
+if test x$BUILD_WITH_FATAL = xyes; then
+    AC_MSG_NOTICE(Will build with fatal warnings)
+    FATAL_CFLAGS="-Werror"
+else
+    AC_MSG_NOTICE(Will build with non-fatal warnings)
+    FATAL_CFLAGS=""
+fi
+
 # Check support (c unit test)
 PKG_CHECK_MODULES(CHECK, check , [BUILD_TESTS="yes"], [BUILD_TESTS="no"])
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 
-CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Werror -Wno-format"
+CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format ${FATAL_FLAGS}"
 # -Wno-format due to way translation string are done
 
 ### enable MAEMO platform extensions
@@ -153,7 +173,9 @@ HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(PACKAGE_VERSION_MAJOR).la \$(
 AC_SUBST(HILDON_OBJ_CFLAGS)
 AC_SUBST(HILDON_OBJ_LIBS)
 
-AC_CONFIG_FILES([Makefile src/Makefile  \
+AC_CONFIG_FILES([Makefile               \
+                 src/Makefile           \
+                 src/hildon-version.h   \
                  pkgconfig/Makefile     \
                  examples/Makefile      \
                  pkgconfig/hildon.pc    \
@@ -177,5 +199,6 @@ Configuration:
 - Build examples.....: ${BUILD_EXAMPLES}
 - Build with asserts.: ${BUILD_WITH_ASSERTS}
 - Build unit tests...: ${BUILD_TESTS}
+- Fatal warnings.....: ${BUILD_WITH_FATAL}
 
 "