Commit a151d7e6 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

readded some AC_SUBST() that were removed under the wrong assumption they

2007-12-20  Sven Neumann  <sven@gimp.org>

	* configure.in: readded some AC_SUBST() that were removed under
	the wrong assumption they would not be needed any longer.
	Consistently use # to mark comments in configure.in.


svn path=/trunk/; revision=24416
parent 50e629af
2007-12-20 Sven Neumann <sven@gimp.org>
* configure.in: readded some AC_SUBST() that were removed under
the wrong assumption they would not be needed any longer.
Consistently use # to mark comments in configure.in.
2007-12-20 Sven Neumann <sven@gimp.org>
* app/app.c: call gegl_exit() on shutdown.
......
dnl Process this file with autoconf to produce a configure script.
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.54)
......@@ -107,9 +107,15 @@ AC_SUBST(GIMP_UNSTABLE)
AC_SUBST(GIMP_FULL_NAME)
dnl The symbol GIMP_UNSTABLE is defined above for substitution in
dnl Makefiles and conditionally defined here as a preprocessor symbol
dnl and automake conditional.
# These are used in the .pc files
GLIB_REQUIRED_VERSION=glib_required_version
GTK_REQUIRED_VERSION=gtk_required_version
AC_SUBST(GLIB_REQUIRED_VERSION)
AC_SUBST(GTK_REQUIRED_VERSION)
# The symbol GIMP_UNSTABLE is defined above for substitution in
# Makefiles and conditionally defined here as a preprocessor symbol
# and automake conditional.
if test "x$GIMP_UNSTABLE" = "xyes"; then
AC_DEFINE(GIMP_UNSTABLE, 1,
[Define to 1 if this is an unstable version of GIMP])
......@@ -134,7 +140,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.])
dnl Initialize libtool
# Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
......@@ -142,10 +148,10 @@ AM_PROG_LIBTOOL
AM_PROG_AS
dnl Initialize maintainer mode
# Initialize maintainer mode
AM_MAINTAINER_MODE
dnl Honor aclocal flags
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
......@@ -235,13 +241,13 @@ AC_SUBST(WINDRES)
# Generic stuff
###############
dnl Checks for programs.
# Checks for programs.
AC_ISC_POSIX
AM_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
dnl Large file support for the swap file
# Large file support for the swap file
AC_SYS_LARGEFILE
AC_MSG_CHECKING([whether to turn on debugging])
......@@ -364,7 +370,7 @@ AC_FUNC_VPRINTF
AC_FUNC_ALLOCA
dnl check some more funcs
# check some more funcs
AC_CHECK_FUNCS(difftime mmap)
AM_BINRELOC
......@@ -386,9 +392,9 @@ fi
# Internationalisation
######################
dnl Note to translators: you MUST have .po files in all 5 directories: po,
dnl po-libgimp, po-plug-ins, po-python and po-script-fu before adding your
dnl language code to ALL_LINGUAS.
# Note to translators: you MUST have .po files in all 5 directories: po,
# po-libgimp, po-plug-ins, po-python and po-script-fu before adding your
# language code to ALL_LINGUAS.
ALL_LINGUAS="ar bg ca cs da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hu hr id it ja km ko lt mk ms nb ne nl oc pa pl pt pt_BR ro ru rw sk sl sr sr@Latn sv tr tt uk vi xh yi zh_CN zh_TW"
AC_PROG_INTLTOOL
......@@ -419,7 +425,7 @@ fi
AC_MSG_RESULT($have_glib_2_17)
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
gimp_save_LIBS=$LIBS
LIBS="$LIBS $GLIB_LIBS"
AC_CHECK_FUNCS(bind_textdomain_codeset,,
......@@ -507,7 +513,7 @@ AC_SUBST(FREETYPE_LIBS)
AC_CHECK_HEADERS(math.h ieeefp.h)
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
# DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
gimp_save_LIBS=$LIBS
LIBS="$LIBS -lm"
......@@ -525,7 +531,7 @@ AC_TRY_RUN([#include <math.h>
AC_MSG_RESULT),
AC_MSG_RESULT())
dnl Check for finite or isfinite
# Check for finite or isfinite
AC_CHECK_FUNCS(finite, , [
AC_MSG_CHECKING(for finite in <math.h>)
AC_TRY_LINK([#include <math.h>], [double f = 0.0; finite (f)], [
......@@ -543,7 +549,7 @@ AC_SUBST(HAVE_ISFINITE)
LIBS=$gimp_save_LIBS
dnl NeXTStep cc seems to need this
# NeXTStep cc seems to need this
AC_MSG_CHECKING([for extra flags for POSIX compliance])
AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
AC_MSG_RESULT(none needed),
......@@ -555,7 +561,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
CFLAGS=$gimp_save_CFLAGS
AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
dnl check for rint
# check for rint
AC_CHECK_FUNC(rint, AC_DEFINE(HAVE_RINT, 1,
[Define to 1 if you have the rint function.]), [
AC_CHECK_LIB(m, rint, [
......@@ -697,7 +703,7 @@ fi
# Checks for shared memory handling
###################################
dnl MacOS X has broken SysV shm
# MacOS X has broken SysV shm
case "$target_or_host" in
*-*-darwin* | *-*-rhapsody* | *-*-machten*)
shmdefault=posix
......@@ -859,15 +865,15 @@ fi
GIMP_COMMAND='gimp-gimp_app_version'
dnl Check if building for GTK+-X11
# Check if building for GTK+-X11
gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
if test "$gdk_target" = x11; then
dnl doc-shooter is X11 specific
# doc-shooter is X11 specific
DOC_SHOOTER=doc-shooter
dnl screenshot plug-in needs to link to X11 explicitely
# screenshot plug-in needs to link to X11 explicitely
LIBSCREENSHOT="$X_LIBS -lX11"
gimp_save_CFLAGS="$CFLAGS"
......@@ -875,7 +881,7 @@ if test "$gdk_target" = x11; then
CFLAGS="$CFLAGS $GTK_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
dnl Test for Xmu
# Test for Xmu
enable_gimp_remote=yes
if test -z "$LIBXMU"; then
AC_CHECK_LIB(Xmu, XmuClientWindow,
......@@ -889,7 +895,7 @@ if test "$gdk_target" = x11; then
LIBSCREENSHOT="$LIBXMU"
fi
dnl Check for shaped window extension
# Check for shaped window extension
AC_CHECK_LIB(Xext, XShapeGetRectangles,
[AC_CHECK_HEADERS(X11/extensions/shape.h,
LIBSCREENSHOT="$LIBSCREENSHOT -lXext",,[#include <gdk/gdkx.h>])],,
......@@ -898,7 +904,7 @@ if test "$gdk_target" = x11; then
CFLAGS="$gimp_save_CFLAGS"
LDFLAGS="$gimp_save_LDFLAGS"
dnl check for the XFixes extension
# check for the XFixes extension
PKG_CHECK_MODULES(XFIXES, xfixes,
AC_DEFINE(HAVE_XFIXES, 1,
[Define to 1 to if the XFIXES X extension is available])
......@@ -1541,7 +1547,7 @@ AM_CONDITIONAL(WITH_PDBGEN, test "x$with_pdbgen" = xyes)
# Check for python
##################
dnl Pygimp configure stuff ...
# Pygimp configure stuff ...
AC_ARG_ENABLE(python,
AC_HELP_STRING([--disable-python],
[do not build the python extension]))
......@@ -1554,16 +1560,16 @@ m4_define([pycheck_error], [
if test "x$enable_python" != xno; then
enable_python="yes"
dnl check for Python
# check for Python
AM_PATH_PYTHON(2.3.5,,
[AC_MSG_ERROR([pycheck_error([Python 2.3.5 or newer], [it])])])
AM_CHECK_PYTHON_HEADERS(,
[AC_MSG_ERROR([pycheck_error([Python headers], [them])])])
dnl Win32 needs all symbols resolved for linking, even for DLLs
dnl Assume the link library is in $exec_prefix/libs
dnl This might be able to be figured out from distutils, but it's
dnl not documented so we won't rely on internal implementation
# Win32 needs all symbols resolved for linking, even for DLLs
# Assume the link library is in $exec_prefix/libs
# This might be able to be figured out from distutils, but it's
# not documented so we won't rely on internal implementation
PYLINK_LIBS=
if test "x$platform_win32" = "xyes"; then
PYBIN_PATH="$py_exec_prefix\pythonw.exe"
......@@ -1577,7 +1583,7 @@ if test "x$enable_python" != xno; then
AC_SUBST(PYLINK_LIBS)
AC_SUBST(PYBIN_PATH)
dnl check for PyGTK
# check for PyGTK
PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version,,
[AC_MSG_ERROR([pycheck_error([PyGTK pygtk_required_version or newer], [it])])])
......@@ -1691,8 +1697,8 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
GTK_DOC_CHECK([1.0])
dnl NOTE: We need to use a separate automake conditional for this
dnl to make this work with the tarballs.
# NOTE: We need to use a separate automake conditional for this
# to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = xyes)
AC_ARG_ENABLE(gtk-doc-app, [ --enable-gtk-doc-app build developer documentation for app (default=no)], , enable_gtk_doc_app=no)
......@@ -1713,7 +1719,7 @@ AC_ARG_ENABLE(gimp-console, [ --enable-gimp-console build a console-only bina
AM_CONDITIONAL(ENABLE_GIMP_CONSOLE, test "x$enable_gimp_console" != xno)
dnl Possibly change default gimpdir from .gimp-major.minor
# Possibly change default gimpdir from .gimp-major.minor
gimpdir=.gimp-gimp_user_version
AC_ARG_WITH(gimpdir, [ --with-gimpdir=DIR change default gimpdir from .gimp-gimp_user_version to DIR],
if eval "test x$with_gimpdir != x"; then
......@@ -1755,7 +1761,7 @@ AC_SUBST(GIMPINSTALL)
AM_CONDITIONAL(STATICLIBS, test "x$enable_static" = xyes)
dnl a tuned version of glib-mkenums
# a tuned version of glib-mkenums
GIMP_MKENUMS="\$(PERL) \$(top_srcdir)/tools/gimp-mkenums"
AC_SUBST(GIMP_MKENUMS)
......@@ -1790,7 +1796,7 @@ CPPFLAGS="${CPPFLAGS} -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
# configure output
##################
dnl easy way to skip the plug-in build
# easy way to skip the plug-in build
GIMP_PLUGINS=plug-ins
GIMP_MODULES=modules
AC_SUBST(GIMP_PLUGINS)
......@@ -1981,7 +1987,7 @@ gimp-zip
Makefile
])
dnl Files with versions in their names
# Files with versions in their names
AC_CONFIG_FILES(
docs/gimp-gimp_app_version.1:docs/gimp.1.in
docs/gimprc-gimp_app_version.5:docs/gimprc.5.in
......@@ -2001,7 +2007,7 @@ sed -e "/POTFILES =/r po-tips/POTFILES" po-tips/Makefile.in > po-tips/Makefile])
AC_OUTPUT
dnl Print a summary of features enabled/disabled:
# Print a summary of features enabled/disabled:
AC_MSG_RESULT([
Building GIMP with prefix=$prefix, datarootdir=$datarootdir
Desktop files install into $DESKTOP_DATADIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment