-AC_INIT([Hildon gtk widgets], [1.0.13], [michael.kostrzewa@nokia.com], [hildon])
+AC_INIT([Hildon gtk widgets], [2.1.80], [hildon@projects.maemo.org], [hildon])
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([src/hildon-window.h])
+AC_CONFIG_SRCDIR([hildon/hildon-window.h])
AC_CONFIG_MACRO_DIR([m4])
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.
# 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, 13, 0, 13)
+AS_LIBTOOL(HILDON, 18, 7, 18)
AM_INIT_AUTOMAKE
AC_PROG_CC
+AM_PROG_CC_C_O
AM_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_AWK
AC_HEADER_STDC
-GTK_VERSION=2.10
+GTK_VERSION=2.12.12
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VERSION)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_VERSION)
-# ESD is needed for the hildon-note sounds.
+# libcanberra is needed for the hildon-note sounds.
-PKG_CHECK_MODULES(ESD, esound)
-AC_SUBST(ESD_LIBS)
-AC_SUBST(ESD_CFLAGS)
+PKG_CHECK_MODULES(CANBERRA, libcanberra)
+AC_SUBST(CANBERRA_LIBS)
+AC_SUBST(CANBERRA_CFLAGS)
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6)
AC_SUBST(GCONF_CFLAGS)
# just print out our status
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_GTK="-DMAEMO_GTK"
+ AC_SUBST(MAEMO_GTK)
+ MAEMO_CHANGES="-DMAEMO_CHANGES"
+ AC_SUBST(MAEMO_CHANGES)
else
AC_MSG_NOTICE(Will not use Maemo GTK+ specific API)
fi
FATAL_CFLAGS=""
fi
+# disable deprecated symbols
+AC_ARG_ENABLE(deprecated,
+ [AC_HELP_STRING([--enable-deprecated],
+ [enable use of deprecated symbols [default=yes]])],,
+ [enable_deprecated="yes"])
+
+if test x$enable_deprecated = xno; then
+ DISABLE_DEPRECATED="-DHILDON_DISABLE_DEPRECATED"
+fi
+
+AM_CONDITIONAL([HILDON_DISABLE_DEPRECATED], test "x$enable_deprecated" = "xno")
+
# 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 ${FATAL_FLAGS}"
+CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format ${FATAL_CFLAGS}"
# -Wno-format due to way translation string are done
+### disable deprecated symbols
+EXTRA_CFLAGS="$DISABLE_DEPRECATED"
+AC_SUBST(EXTRA_CFLAGS)
+
### enable MAEMO platform extensions
-CFLAGS="$CFLAGS -DMAEMO_CHANGES -DHILDON_ENABLE_UNSTABLE_API"
+CFLAGS="$CFLAGS $MAEMO_CHANGES $MAEMO_GTK"
# 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_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/hildon/"
+HILDON_OBJ_LIBS="\$(top_builddir)/hildon/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 \
- src/hildon-version.h \
+ hildon/Makefile \
+ hildon/hildon-version.h \
pkgconfig/Makefile \
examples/Makefile \
pkgconfig/hildon.pc \
- Package:...........: ${PACKAGE}
- Version............: ${VERSION}
-- Api................: ${PACKAGE}-${PACKAGE_VERSION_MAJOR}
+- Api................: ${PACKAGE}-${API_VERSION_MAJOR}
- Compiler...........: ${CC}
+- Enable deprecated..: ${enable_deprecated}
- gtk-doc support....: ${enable_gtk_doc}
- Build examples.....: ${BUILD_EXAMPLES}
- Build with asserts.: ${BUILD_WITH_ASSERTS}
projects / hildon / blobdiff