[giggle] Cleaning configure.ac file
- From: Javier Jardón <jjardon src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [giggle] Cleaning configure.ac file
- Date: Fri, 22 Jan 2010 01:47:55 +0000 (UTC)
commit 7e8e02c82098dbe25fa8d0203e9dc76cf99ebe7a
Author: Javier Jardón <jjardon gnome org>
Date: Fri Jan 22 00:55:18 2010 +0100
Cleaning configure.ac file
Also, use GNOME compile warnings by default instead IMENDIO ones
Makefile.am | 2 +-
acinclude.m4 | 36 ++++++++++++++++++++++
configure.ac | 51 ++++++++++++++-----------------
m4/giggle.m4 | 96 ----------------------------------------------------------
4 files changed, 60 insertions(+), 125 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f8b065..3386e55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = data libgiggle libgiggle-git plugins src po pixmaps test
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000..df6c273
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,36 @@
+AC_DEFUN([IGE_PLATFORM_CHECK],[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+
+ AC_MSG_CHECKING([which GTK+ platform to use...])
+
+ gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
+
+ if test "x$gdk_target" = "xquartz"; then
+ carbon_ok=no
+ AC_TRY_CPP([
+ #include <Carbon/Carbon.h>
+ #include <CoreServices/CoreServices.h>
+ ], carbon_ok=yes)
+ if test $carbon_ok = yes; then
+ IGE_PLATFORM=osx
+ IGE_PLATFORM_NAME="GTK+ OS X"
+ AC_DEFINE(IGE_PLATFORM_OSX, 1, [whether GTK+ OS X is available])
+ fi
+ elif test "x$gdk_target" = "xx11"; then
+ IGE_PLATFORM=x11
+ IGE_PLATFORM_NAME="GTK+ X11"
+ AC_DEFINE(IGE_PLATFORM_X11, 1, [whether GTK+ X11 is available])
+ elif test "x$gdk_target" = "xwin32"; then
+ IGE_PLATFORM=win32
+ IGE_PLATFORM_NAME="GTK+ Windows"
+ AC_DEFINE(IGE_PLATFORM_WIN32, 1, [whether GTK+ WIN32 is available])
+ else
+ AC_MSG_ERROR([Could not detect the platform])
+ fi
+
+ AC_MSG_RESULT([$IGE_PLATFORM_NAME])
+
+ AM_CONDITIONAL(IGE_PLATFORM_X11, test $IGE_PLATFORM = x11)
+ AM_CONDITIONAL(IGE_PLATFORM_OSX, test $IGE_PLATFORM = osx)
+ AM_CONDITIONAL(IGE_PLATFORM_WIN32, test $IGE_PLATFORM = win32)
+])
diff --git a/configure.ac b/configure.ac
index 8e5209c..4ac8bc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,40 +1,36 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
+AC_INIT([Giggle],[0.4.91],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=giggle],
+ [giggle])
-AC_INIT([giggle],[0.4.91],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=giggle])
-
-AC_SUBST([LIBGIGGLE_ABI], [0:0:0])
-AC_SUBST([LIBGIGGLE_GIT_ABI], [0:0:0])
-
-AC_CONFIG_SRCDIR([src/giggle-main.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_INIT_AUTOMAKE([1.10 check-news no-define -Wall -Werror])
# Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_HEADERS([config.h])
-
-AC_DISABLE_STATIC
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CXX
-CXX=no
-F77=no
+LT_PREREQ([2.2.0])
+LT_INIT([disable-static win32-dll])
-LT_PREREQ([2.2])
-LT_INIT
+GNOME_COMMON_INIT
+GNOME_MAINTAINER_MODE_DEFINES
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_CXX_WARNINGS
-AC_ISC_POSIX
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PROG_CC
-AC_HEADER_STDC
-
-AM_PATH_GLIB_2_0
+AC_SUBST([LIBGIGGLE_ABI], [0:0:0])
+AC_SUBST([LIBGIGGLE_GIT_ABI], [0:0:0])
-dnl Defined in acinclude.m4
-IMENDIO_COMPILE_WARNINGS
dnl ------------------
dnl | Pkgconfig checks |---------------------------------------
@@ -115,13 +111,12 @@ AC_RUN_IFELSE(
dnl ------------------
dnl | Language Support |---------------------------------------
dnl ------------------
-GETTEXT_PACKAGE=giggle
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
-AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
-
-AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL([0.35.0])
+AC_SUBST([GETTEXT_PACKAGE], [giggle])
+AM_GNU_GETTEXT_VERSION([0.11])
+AM_GLIB_GNU_GETTEXT
+AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME],[Define to the gettext package name])
+AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]