2008-03-04 Michael Natterer <mitch@imendio.com>

[hildon] / configure.ac

diff --git a/configure.ac b/configure.ac
index 51c1408..c98cbdd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Hildon gtk widgets], [1.0.9], [michael.kostrzewa@nokia.com], [hildon])
+AC_INIT([Hildon gtk widgets], [2.0.1], [xan.lopez@nokia.com], [hildon])
 AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
@@ -9,6 +9,10 @@ AM_MAINTAINER_MODE
 # define PACKAGE_VERSION_* variables
 AS_VERSION
 
+#define API_VERSION_MAJOR
+API_VERSION_MAJOR=1
+AC_SUBST(API_VERSION_MAJOR)
+
 # set the libtool versioning
 # Quick guide into libtool versioning:
 # 1. Start with version information of `0:0:0' for each libtool library.
@@ -21,7 +25,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, 9, 0, 9)
+AS_LIBTOOL(HILDON, 18, 1, 18)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
@@ -110,12 +114,12 @@ AM_CONDITIONAL(USE_MAEMO_GTK, test "x$USE_MAEMO_GTK" = "xyes")
 if test x$USE_MAEMO_GTK = xyes; then
     AC_MSG_NOTICE(Will use Maemo GTK+ specific API)
     AC_DEFINE(MAEMO_GTK, [], [Whether to use Maemo GTK+ specific API])
+    MAEMO_CHANGES="-DMAEMO_CHANGES"
+    AC_SUBST(MAEMO_CHANGES)
 else
     AC_MSG_NOTICE(Will not use Maemo GTK+ specific API)
 fi
 
-AC_ARG_ENABLE 
-
 # build with assertion checks (or not)
 AC_ARG_WITH(asserts, 
     AC_HELP_STRING([--with-asserts], [Build with the assertion checks]),
@@ -148,34 +152,36 @@ AC_ARG_ENABLE(fatal,
      [BUILD_WITH_FATAL=no])
 
 # just print out our status
-if test x$BUILD_WITH_XAN = xyes; then
+if test x$BUILD_WITH_FATAL = xyes; then
     AC_MSG_NOTICE(Will build with fatal warnings)
-    XAN_CFLAGS="-Werror"
+    FATAL_CFLAGS="-Werror"
 else
     AC_MSG_NOTICE(Will build with non-fatal warnings)
-    XAN_CFLAGS=""
+    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 -Wno-format ${XAN_FLAGS}"
+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
-CFLAGS="$CFLAGS -DMAEMO_CHANGES -DHILDON_ENABLE_UNSTABLE_API"
+CFLAGS="$CFLAGS $MAEMO_CHANGES"
 
 # HILDON_OBJ_*
 # default vars for the examples
 # includes all the low-level flags
 # FIXME Add esd and gconf flags
 HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/src/"
-HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(PACKAGE_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`"
+HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(API_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`"
 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    \
@@ -193,7 +199,7 @@ Configuration:
 
 - Package:...........: ${PACKAGE}
 - Version............: ${VERSION}
-- Api................: ${PACKAGE}-${PACKAGE_VERSION_MAJOR}
+- Api................: ${PACKAGE}-${API_VERSION_MAJOR}
 - Compiler...........: ${CC}
 - gtk-doc support....: ${enable_gtk_doc}
 - Build examples.....: ${BUILD_EXAMPLES}