From: David King Date: Thu, 18 Oct 2012 08:56:36 +0000 (+0100) Subject: Update configure.ac to recent autoconf syntax X-Git-Tag: 1.8~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a3d48100e4d65d7a5d0ad25574a4b177958a946;p=platform%2Fupstream%2Flibgsignon-glib.git Update configure.ac to recent autoconf syntax --- diff --git a/.gitignore b/.gitignore index cb976b2..4ef0048 100644 --- a/.gitignore +++ b/.gitignore @@ -4,30 +4,25 @@ Makefile Makefile.in aclocal.m4 -compile +/build-aux/ configure config.* debian -depcomp /docs/reference/html/ /docs/reference/libsignon-glib* !/docs/reference/libsignon-glib-sections.txt /docs/reference/tmpl/ /docs/reference/xml/ gtk-doc.make -install-sh /libsignon-glib/signon-errors-map.c /libsignon-glib/signon-marshal.c /libsignon-glib/signon-marshal.h /libsignon-glib/sso-*-gen.* libtool -ltmain.sh m4/gtk-doc.m4 m4/libtool.m4 m4/lt*.m4 -missing patches/ -/py-compile stamp-h1 *~ *.cache diff --git a/configure.ac b/configure.ac index 2397082..7dca4ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1,84 +1,84 @@ dnl Process this file with autoconf to produce a configure script. +AC_PREREQ([2.64]) +AC_INIT([libsignon-glib], + [1.7], + [http://code.google.com/p/accounts-sso/issues/entry], + [libsignon-glib], + [http://code.google.com/p/accounts-sso/]) + +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([libsignon-glib.pc.in]) +AC_CONFIG_MACRO_DIR([m4]) -AC_INIT(libsignon-glib, 1.7) +AM_INIT_AUTOMAKE([1.11 -Wall nostdinc silent-rules subdir-objects]) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER(config.h) +AC_PROG_CC +AC_PROG_CC_STDC +AM_PROG_CC_C_O + +LT_PREREQ([2.2]) +LT_INIT([disable-static]) # Gobject Introspection -AC_CONFIG_MACRO_DIR([m4]) GOBJECT_INTROSPECTION_CHECK([1.30.0]) PKG_CHECK_MODULES( - DEPS, - gio-2.0 >= 2.30 - gio-unix-2.0 - glib-2.0 >= 2.32 - gobject-2.0 - signond >= 8.40); + [DEPS], + [gio-2.0 >= 2.30 + gio-unix-2.0 + glib-2.0 >= 2.32 + gobject-2.0 + signond >= 8.40]) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -AC_ISC_POSIX -AC_PROG_CC -AM_PROG_CC_STDC -AM_PROG_CC_C_O -AC_HEADER_STDC -AC_PROG_LIBTOOL - GTK_DOC_CHECK([1.14], [--flavour no-tmpl]) -AC_ARG_ENABLE(cast-checks, [ --disable-cast-checks compile with GLIB cast checks disabled],[cchecks=${enableval}],cchecks=yes) -if test "x$cchecks" = "xno"; then - CFLAGS="$CFLAGS -DG_DISABLE_CAST_CHECKS" -fi +AC_ARG_ENABLE([cast-checks], + [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])]) +AS_IF([test "x$enable_cast_checks" = "xno"], + [CFLAGS="$CFLAGS -DG_DISABLE_CAST_CHECKS"]) -AC_ARG_ENABLE(asserts, [ --disable-asserts compile with GLIB assertions disabled],[asserts=${enableval}],asserts=yes) -if test "x$asserts" = "xno"; then - CFLAGS="$CFLAGS -DG_DISABLE_ASSERTS" -fi +AC_ARG_ENABLE([asserts], + [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])]) +AS_IF([test "x$enable_asserts" = "xno"], + [CFLAGS="$CFLAGS -DG_DISABLE_ASSERTS"]) -AC_ARG_ENABLE(checks, [ --disable-checks compile with GLIB checks disabled],[checks=${enableval}],checks=yes) -if test "x$checks" = "xno"; then - CFLAGS="$CFLAGS -DG_DISABLE_CHECKS" -fi +AC_ARG_ENABLE([checks], + [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])]) +AS_IF([test "x$checks" = "xno"], + [CFLAGS="$CFLAGS -DG_DISABLE_CHECKS"]) -AC_ARG_ENABLE(debug, [ --enable-debug enable printing of debug messages],[ddebug=${enableval}],ddebug=no) -if test "x$ddebug" != "xyes"; then - CFLAGS="$CFLAGS -DG_DEBUG_DISABLE" -fi +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], [enable printing of debug messages])]) +AS_IF([test "x$enable_debug" = "xyes"], + [CFLAGS="$CFLAGS -DENABLE_DEBUG"]) -AC_ARG_ENABLE(coverage, [ --enable-coverage compile with coverage info],[coverage=${enableval}],coverage=no) -if test "x$coverage" = "xyes"; then - CFLAGS="$CFLAGS -g -fprofile-arcs -ftest-coverage" -fi - -AM_PATH_PYTHON +AC_ARG_ENABLE([coverage], + [AS_HELP_STRING([--enable-coverage], [compile with coverage info])]) +AS_IF([test "x$enable_coverage" = "xyes"], + [CFLAGS="$CFLAGS -g -fprofile-arcs -ftest-coverage"]) +# Python support. PYGOBJECT_REQUIRED=2.90 AC_ARG_ENABLE([python], - AS_HELP_STRING([--enable-python[=@<:@no/auto/yes@:>@]],[Build with python support]), - [enable_python=$enableval], - [enable_python="auto"]) - -if test "x$enable_python" = "xauto"; then - PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], - [enable_python=yes],[enable_python=no]) -fi + [AS_HELP_STRING([--enable-python], [Build with python support])]) -if test "x$enable_python" = "xyes"; then - PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) +AS_IF([test "x$enable_python" != "xno"], + [PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], + [have_python=yes], [have_python=no])]) - pyoverridesdir=`$PYTHON -c "import gi;print gi._overridesdir"` - AC_SUBST(pyoverridesdir) -fi +AS_IF([test "x$have_python" = "xyes"], + [AM_PATH_PYTHON + AC_SUBST([pyoverridesdir], [`$PYTHON -c "import gi;print gi._overridesdir"`])]) -AM_CONDITIONAL(ENABLE_PYTHON, test x"$enable_python" = "xyes") +AM_CONDITIONAL([ENABLE_PYTHON], [test "x$have_python" = "xyes"]) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile libsignon-glib/Makefile libsignon-glib.pc @@ -87,3 +87,4 @@ AC_OUTPUT([ tests/Makefile pygobject/Makefile ]) +AC_OUTPUT