Commit 9db6153f authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

modernized, made a lot of things m4 macros, and made versioning a lot more

2004-01-21  Manish Singh  <yosh@gimp.org>

        * configure.in: modernized, made a lot of things m4 macros, and made
        versioning a lot more finegrained, in anticipation for post-2.0.

        * autogen.sh: bumped up libtool and glib minimum requirements to match
        reality.

        * gimp-2.0.pc.in
        * gimpthumb-2.0.pc.in
        * gimpui-2.0.pc.in: adapted to new versioning variables, and bring
        in RT_LIBS when needed.

        * */*/Makefile.am: adapted to new versioning variables.
parent 72d7aaae
2004-01-21 Manish Singh <yosh@gimp.org>
* configure.in: modernized, made a lot of things m4 macros, and made
versioning a lot more finegrained, in anticipation for post-2.0.
* autogen.sh: bumped up libtool and glib minimum requirements to match
reality.
* gimp-2.0.pc.in
* gimpthumb-2.0.pc.in
* gimpui-2.0.pc.in: adapted to new versioning variables, and bring
in RT_LIBS when needed.
* */*/Makefile.am: adapted to new versioning variables.
2004-01-22 Michael Natterer <mitch@gimp.org>
* app/core/gimplayer-floating-sel.c (floating_sel_anchor):
......@@ -26,15 +26,15 @@ SUBDIRS = \
$(GIMP_DEVEL_DOCS) \
docs
bin_SCRIPTS = gimptool-2.0 @GIMPINSTALL@
bin_SCRIPTS = gimptool-@GIMP_TOOL_VERSION@ @GIMPINSTALL@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
gimp-2.0.pc \
gimpthumb-2.0.pc \
gimpui-2.0.pc
gimp-@GIMP_PKGCONFIG_VERSION@.pc \
gimpthumb-@GIMP_PKGCONFIG_VERSION@.pc \
gimpui-@GIMP_PKGCONFIG_VERSION@.pc
EXTRA_SCRIPTS = gimpinstall-$(LT_RELEASE)
EXTRA_SCRIPTS = gimpinstall-@GIMP_TOOL_VERSION@
EXTRA_DIST = \
AUTHORS \
......@@ -71,14 +71,14 @@ DISTCLEANFILES = \
intltool-update
gimpinstall-@LT_RELEASE@:
$(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-$(LT_RELEASE)
gimpinstall-@GIMP_TOOL_VERSION@:
$(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-@GIMP_TOOL_VERSION@
install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gimptool \
&& $(LN_S) gimptool-2.0 gimptool
&& $(LN_S) gimptool-@GIMP_TOOL_VERSION@ gimptool
endif
uninstall-local:
......
## Process this file with automake to produce Makefile.in
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
SUBDIRS = \
paint-funcs \
composite \
......@@ -71,68 +78,68 @@ INCLUDES = \
-I$(includedir)
gimp_1_3_LDADD = \
config/libappconfig.a \
gui/libappgui.a \
display/libappdisplay.a \
tools/libapptools.a \
widgets/libappwidgets.a \
core/libappcore.a \
pdb/libapppdb.a \
paint/libapppaint.a \
xcf/libappxcf.a \
text/libapptext.a \
vectors/libappvectors.a \
file/libappfile.a \
plug-in/libappplug-in.a \
paint-funcs/libapppaint-funcs.a \
composite/libappcomposite.a \
base/libappbase.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(top_builddir)/libgimpmodule/libgimpmodule-$(LT_RELEASE).la \
$(top_builddir)/libgimpthumb/libgimpthumb-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(LIBART_LIBS) \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
config/libappconfig.a \
gui/libappgui.a \
display/libappdisplay.a \
tools/libapptools.a \
widgets/libappwidgets.a \
core/libappcore.a \
pdb/libapppdb.a \
paint/libapppaint.a \
xcf/libappxcf.a \
text/libapptext.a \
vectors/libappvectors.a \
file/libappfile.a \
plug-in/libappplug-in.a \
paint-funcs/libapppaint-funcs.a \
composite/libappcomposite.a \
base/libappbase.a \
$(libgimpwidgets) \
$(libgimpmodule) \
$(libgimpcolor) \
$(libgimpthumb) \
$(libgimpmath) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBART_LIBS) \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(REGEXREPL)
if ENABLE_GIMP_CONSOLE
gimp_console_1_3_SOURCES = $(gimp_1_3_SOURCES)
gimp_console_1_3_LDADD = \
config/libappconfig.a \
core/libappcore.a \
pdb/libapppdb.a \
paint/libapppaint.a \
xcf/libappxcf.a \
text/libapptext.a \
vectors/libappvectors.a \
file/libappfile.a \
plug-in/libappplug-in.a \
paint-funcs/libapppaint-funcs.a \
base/libappbase.a \
composite/libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(top_builddir)/libgimpthumb/libgimpthumb-$(LT_RELEASE).la \
$(top_builddir)/libgimpmodule/libgimpmodule-$(LT_RELEASE).la \
$(GDK_PIXBUF_LIBS) \
$(LIBART_LIBS) \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS) \
config/libappconfig.a \
core/libappcore.a \
pdb/libapppdb.a \
paint/libapppaint.a \
xcf/libappxcf.a \
text/libapptext.a \
vectors/libappvectors.a \
file/libappfile.a \
plug-in/libappplug-in.a \
paint-funcs/libapppaint-funcs.a \
base/libappbase.a \
composite/libappcomposite.a \
$(libgimpmodule) \
$(libgimpcolor) \
$(libgimpthumb) \
$(libgimpmath) \
$(libgimpbase) \
$(GDK_PIXBUF_LIBS) \
$(LIBART_LIBS) \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS) \
$(REGEXREPL)
endif
......@@ -140,11 +147,11 @@ install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gimp$(EXEEXT) \
&& $(LN_S) gimp-$(LT_RELEASE)$(EXEEXT) gimp$(EXEEXT)
&& $(LN_S) gimp-$(GIMP_APP_VERSION)$(EXEEXT) gimp$(EXEEXT)
if ENABLE_GIMP_CONSOLE
cd $(DESTDIR)$(bindir) \
&& rm -f gimp-console$(EXEEXT) \
&& $(LN_S) gimp-console-$(LT_RELEASE)$(EXEEXT) gimp-console$(EXEEXT)
&& $(LN_S) gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) gimp-console$(EXEEXT)
endif
endif
......@@ -160,6 +167,6 @@ endif
# hooks to assure that the system gimprc and the gimprc manpage are
# uptodate when a release is made
dist-hook: gimp-1.3
dist-hook: gimp-@GIMP_APP_VERSION@
./$< --dump-gimprc-system > $(top_srcdir)/etc/gimprc
./$< --dump-gimprc-manpage > $(top_srcdir)/docs/gimprc-$(LT_RELEASE).5.in
./$< --dump-gimprc-manpage > $(top_srcdir)/docs/gimprc-$(GIMP_APP_VERSION).5.in
## Process this file with automake to produce Makefile.in
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Composite\" \
@GIMP_THREAD_FLAGS@ \
......@@ -8,8 +10,7 @@ AM_CPPFLAGS = \
AM_CCASFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
-g
-I$(top_srcdir)/app
INCLUDES = \
-I$(top_srcdir) \
......@@ -20,23 +21,23 @@ INCLUDES = \
noinst_LIBRARIES = libappcomposite.a
libappcomposite_a_sources = \
gimp-composite-3dnow.c \
gimp-composite-3dnow.h \
gimp-composite-altivec.c \
gimp-composite-altivec.h \
gimp-composite-generic.c \
gimp-composite-generic.h \
gimp-composite-mmx.c \
gimp-composite-mmx.h \
gimp-composite-sse.c \
gimp-composite-sse.h \
gimp-composite-sse2.c \
gimp-composite-sse2.h \
gimp-composite-util.h \
gimp-composite-vis.c \
gimp-composite-vis.h \
gimp-composite-x86.h \
gimp-composite.c \
gimp-composite-3dnow.c \
gimp-composite-3dnow.h \
gimp-composite-altivec.c \
gimp-composite-altivec.h \
gimp-composite-generic.c \
gimp-composite-generic.h \
gimp-composite-mmx.c \
gimp-composite-mmx.h \
gimp-composite-sse.c \
gimp-composite-sse.h \
gimp-composite-sse2.c \
gimp-composite-sse2.h \
gimp-composite-util.h \
gimp-composite-vis.c \
gimp-composite-vis.h \
gimp-composite-x86.h \
gimp-composite.c \
gimp-composite.h
libappcomposite_a_built_sources = \
......@@ -92,9 +93,9 @@ gimp_composite_test_SOURCES = \
gimp_composite_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
......@@ -106,9 +107,9 @@ gimp_composite_mmx_test_SOURCES = \
gimp_composite_mmx_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_mmx_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
gimp_composite_sse_test_SOURCES = \
......@@ -119,9 +120,9 @@ gimp_composite_sse_test_SOURCES = \
gimp_composite_sse_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_sse_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
gimp_composite_sse2_test_SOURCES = \
......@@ -132,9 +133,9 @@ gimp_composite_sse2_test_SOURCES = \
gimp_composite_sse2_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_sse2_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
......@@ -146,9 +147,9 @@ gimp_composite_3dnow_test_SOURCES = \
gimp_composite_3dnow_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_3dnow_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
......@@ -160,9 +161,9 @@ gimp_composite_altivec_test_SOURCES = \
gimp_composite_altivec_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_altivec_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
gimp_composite_vis_test_SOURCES = \
......@@ -173,7 +174,7 @@ gimp_composite_vis_test_SOURCES = \
gimp_composite_vis_test_DEPENDENCIES = $(gimpcomposite_dependencies)
gimp_composite_vis_test_LDADD = \
libappcomposite.a \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/app/base/libappbase.a \
libappcomposite.a \
../base/libappbase.a \
$(libgimpcolor) \
$(GLIB_LIBS)
## Process this file with automake to produce Makefile.in
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
noinst_LIBRARIES = libappconfig.a
libappconfig_a_SOURCES = \
......@@ -69,12 +73,12 @@ TESTS = test-config
test_config_DEPENDENCIES = $(gimpconfig_libs)
test_config_LDADD = \
../base/libappbase.a \
../core/libappcore.a \
libappconfig.a \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
../base/libappbase.a \
../core/libappcore.a \
libappconfig.a \
$(libgimpcolor) \
$(libgimpmath) \
$(libgimpbase) \
$(GLIB_LIBS)
......
......@@ -14,11 +14,11 @@ PROJECT="The GIMP"
TEST_TYPE=-d
FILE=plug-ins
LIBTOOL_REQUIRED_VERSION=1.3.4
LIBTOOL_REQUIRED_VERSION=1.4
LIBTOOL_WIN32=1.5
AUTOCONF_REQUIRED_VERSION=2.54
AUTOMAKE_REQUIRED_VERSION=1.6
GLIB_REQUIRED_VERSION=2.0.0
GLIB_REQUIRED_VERSION=2.2.0
INTLTOOL_REQUIRED_VERSION=0.17
......
dnl Process this file with autoconf to produce a configure script.
###############
# Sanity checks
###############
# require autoconf 2.54
AC_PREREQ(2.54)
AC_INIT(app/core/gimp.c)
############
# Versioning
############
GLIB_REQUIRED_VERSION=2.2.0
GTK_REQUIRED_VERSION=2.2.2
GDKPIXBUF_REQUIRED_VERSION=$GTK_REQUIRED_VERSION
PANGOFT2_REQUIRED_VERSION=1.2.2
FONTCONFIG_REQUIRED_VERSION=2.2.0
GTKDOC_REQUIRED_VERSION=1.0
GTKHTML2_REQUIRED_VERSION=2.0.0
GIMPPRINT_REQUIRED_VERSION=4.2.0
GIMPPRINT_TOONEW_VERSION=4.3.0
RSVG_REQUIRED_VERSION=2.2.0
WMF_REQUIRED_VERSION=0.2.8
AC_SUBST(GLIB_REQUIRED_VERSION)
AC_SUBST(GTK_REQUIRED_VERSION)
AC_SUBST(PANGOFT2_REQUIRED_VERSION)
AC_SUBST(FONTCONFIG_REQUIRED_VERSION)
AC_SUBST(GTKHTML2_REQUIRED_VERSION)
AC_SUBST(GIMPPRINT_REQUIRED_VERSION)
AC_SUBST(GIMPPRINT_TOONEW_VERSION)
AC_SUBST(RSVG_REQUIRED_VERSION)
AC_SUBST(WMF_REQUIRED_VERSION)
#
# Making releases:
# GIMP_MICRO_VERSION += 1;
# GIMP_INTERFACE_AGE += 1;
......@@ -44,64 +9,120 @@ AC_SUBST(WMF_REQUIRED_VERSION)
# if any functions have been added, set GIMP_INTERFACE_AGE to 0.
# if backwards compatibility has been broken,
# set GIMP_BINARY_AGE and GIMP_INTERFACE_AGE to 0.
#
GIMP_MAJOR_VERSION=1
GIMP_MINOR_VERSION=3
GIMP_MICRO_VERSION=26
GIMP_INTERFACE_AGE=0
GIMP_BINARY_AGE=2
#GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
GIMP_VERSION=2.0pre3
m4_define([gimp_major_version], [1])
m4_define([gimp_minor_version], [3])
m4_define([gimp_micro_version], [26])
m4_define([gimp_real_version],
[gimp_major_version.gimp_minor_version.gimp_micro_version])
m4_define([gimp_version], [gimp_real_version])
m4_define([gimp_interface_age], [0])
m4_define([gimp_binary_age], [2])
# For overriding the version string. Comment out if not needed.
m4_define([gimp_version], [2.0pre3])
# This is the X.Y used in -lgimp-X.Y
m4_define([gimp_api_version], [1.3])
# Versions used for apps, plugins, tools, pkg-config files, and data,
# as well as global and user prefs
m4_define([gimp_app_version], [1.3])
m4_define([gimp_plugin_version], [1.3])
m4_define([gimp_tool_version], [2.0])
m4_define([gimp_pkgconfig_version], [2.0])
m4_define([gimp_data_version], [1.3])
m4_define([gimp_sysconf_version], [1.3])
m4_define([gimp_user_version], [1.3])
# required versions of other packages
m4_define([glib_required_version], [2.2.0])
m4_define([gtk_required_version], [2.2.2])
m4_define([gdk_pixbuf_required_version], [gtk_required_version])
m4_define([pangoft2_required_version], [1.2.2])
m4_define([fontconfig_required_version], [2.2.0])
m4_define([gtkdoc_required_version], [1.0])
m4_define([gtkhtml2_required_version], [2.0.0])
m4_define([gimpprint_required_version], [4.2.0])
m4_define([gimpprint_toonew_version], [4.3.0])
m4_define([rsvg_required_version], [2.2.0])
m4_define([wmf_required_version], [0.2.8])
AC_INIT([GIMP], [gimp_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP],
[gimp])
AC_CONFIG_SRCDIR([app/core/gimp.c])
AM_INIT_AUTOMAKE(no-define)
AM_CONFIG_HEADER(config.h)
GIMP_MAJOR_VERSION=gimp_major_version
GIMP_MINOR_VERSION=gimp_minor_version
GIMP_MICRO_VERSION=gimp_micro_version
GIMP_INTERFACE_AGE=gimp_interface_age
GIMP_BINARY_AGE=gimp_binary_age
GIMP_VERSION=gimp_version
GIMP_REAL_VERSION=gimp_real_version
GIMP_API_VERSION=gimp_api_version
GIMP_APP_VERSION=gimp_app_version
GIMP_PLUGIN_VERSION=gimp_plugin_version
GIMP_TOOL_VERSION=gimp_tool_version
GIMP_PKGCONFIG_VERSION=gimp_pkgconfig_version
GIMP_DATA_VERSION=gimp_data_version
GIMP_SYSCONF_VERSION=gimp_sysconf_version
GIMP_USER_VERSION=gimp_user_version
AC_SUBST(GIMP_MAJOR_VERSION)
AC_SUBST(GIMP_MINOR_VERSION)
AC_SUBST(GIMP_MICRO_VERSION)
AC_SUBST(GIMP_INTERFACE_AGE)
AC_SUBST(GIMP_BINARY_AGE)
AC_SUBST(GIMP_API_VERSION)
AC_SUBST(GIMP_VERSION)
dnl libtool versioning
LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE`
LT_REVISION=$GIMP_INTERFACE_AGE
LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(GIMP_REAL_VERSION)
AC_SUBST(GIMP_API_VERSION)
AC_SUBST(GIMP_APP_VERSION)
AC_SUBST(GIMP_PLUGIN_VERSION)
AC_SUBST(GIMP_TOOL_VERSION)
AC_SUBST(GIMP_PKGCONFIG_VERSION)
AC_SUBST(GIMP_DATA_VERSION)
AC_SUBST(GIMP_SYSCONF_VERSION)
AC_SUBST(GIMP_USER_VERSION)
# libtool versioning
#LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
#LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE`
#LT_REVISION=$GIMP_INTERFACE_AGE
#LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
m4_define([lt_current], [m4_eval(gimp_micro_version - gimp_interface_age)])
m4_define([lt_revision], [gimp_interface_age])
m4_define([lt_age], [m4_eval(gimp_binary_age - gimp_interface_age)])
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_CURRENT_MINUS_AGE)
#####################
# Initialize automake
#####################
GETTEXT_PACKAGE=gimp20
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.])
VERSION=$GIMP_VERSION
PACKAGE=gimp
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl Specify a configuration file
AM_CONFIG_HEADER(config.h)
AM_PROG_AS
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
####################
# Initialize libtool
####################
dnl Initialize libtool
AC_PROG_CC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
###########################
# Check target architecture
......@@ -160,6 +181,7 @@ esac
AC_MSG_RESULT([$os_win32])
AC_SUBST(PATHSEP)
AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
if test "$os_win32" = "yes"; then
AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
......@@ -174,11 +196,8 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
dnl Checks for programs.
AC_ISC_POSIX
AM_PROG_CC_STDC
AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_CPP
dnl Large file support for the swap file
AC_SYS_LARGEFILE
......@@ -215,6 +234,7 @@ AC_ARG_ENABLE(ansi,
[ --enable-ansi turn on strict ansi (default=no)],,
enable_ansi=no)
changequote(,)dnl
if eval "test x$GCC = xyes"; then
case " $CFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;;
......@@ -233,6 +253,7 @@ if eval "test x$GCC = xyes"; then
esac
fi
fi
changequote([,])dnl
# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc.
......@@ -269,6 +290,9 @@ if test x"$os_win32" = xyes; then
fi
fi
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
AC_HEADER_DIRENT
AC_HEADER_STDC
......@@ -291,11 +315,6 @@ AC_CHECK_FUNCS(difftime putenv mmap)
# Internationalisation
######################
GETTEXT_PACKAGE=gimp20
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.])
dnl Note to translators: you MUST have .po files in all 4 directories: po,
dnl po-libgimp, po-plug-ins, and po-script-fu before adding you language
dnl code to ALL_LINGUAS
......@@ -309,7 +328,7 @@ AM_GLIB_GNU_GETTEXT
# Checks for required libraries
###############################
AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION,,
AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
gobject)
......@@ -326,7 +345,7 @@ LIBS=$gimp_save_LIBS
AC_PATH_XTRA
AM_PATH_GTK_2_0($GTK_REQUIRED_VERSION,,
AM_PATH_GTK_2_0(gtk_required_version, :,
AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.))
AC_MSG_CHECKING([if GTK+ is version 2.3.0 or newer])
......@@ -337,7 +356,7 @@ else
fi
AC_MSG_RESULT($have_gtk_2_3)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
......@@ -350,18 +369,18 @@ PKG_CHECK_MODULES(LIBART, libart-2.0)
AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS)
PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= $PANGOFT2_REQUIRED_VERSION,,
PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= pangoft2_required_version, :,
AC_MSG_ERROR([Test for PangoFT2 failed.
*** We require Pango with the optional support for FreeType2 compiled in.
*** See the file 'INSTALL' for more help.]))
AC_SUBST(PANGOFT2_CFLAGS)
AC_SUBST(PANGOFT2_LIBS)
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= $FONTCONFIG_REQUIRED_VERSION)
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
if test "x$FREETYPE_CONFIG" != "xno" ; then
AC_MSG_CHECKING(FREETYPE_LIBS)
AC_MSG_CHECKING([for Freetype libraries])
FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
AC_MSG_RESULT($FREETYPE_LIBS)
fi
......@@ -740,13 +759,13 @@ if test "$gdk_target" = x11; then
LDFLAGS="$LDFLAGS $X_LIBS"
AC_CHECK_LIB(Xmu, XmuClientWindow,
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
GIMP_REMOTE='gimp-remote-1.3';
GIMP_REMOTE='gimp-remote-gimp_app_version';
have_libxmu=yes
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[AC_MSG_WARN(*** gimp-remote will not be built (XMU header file not found) ***)])],
[AC_CHECK_LIB(Xmu, XmuUpdateMapHints,
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
GIMP_REMOTE='gimp-remote-1.3';
GIMP_REMOTE='gimp-remote-gimp_app_version';
have_libxmu=yes
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[AC_MSG_WARN(*** gimp-remote will not be built (XMU header file not found) ***)])],
......@@ -985,7 +1004,7 @@ AC_SUBST(LIBXPM)
# Check for gtkhtml2
####################
PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= $GTKHTML2_REQUIRED_VERSION,
PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version,
have_gtkhtml2=yes,
AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***]))
AC_SUBST(GTKHTML2_CFLAGS)
......@@ -997,7 +1016,7 @@ AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes)
# Check for librsvg
###################
PKG_CHECK_MODULES(SVG, librsvg-2.0 >= $RSVG_REQUIRED_VERSION,
PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
SVG=svg
LIBSVG=$SVG_LIBS,
AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***]))
......@@ -1016,8 +1035,8 @@ AC_ARG_ENABLE(print, [ --disable-print build without print support (req
if test "x$PRINT_CONFIG" != "xno"; then
AC_MSG_CHECKING(for appropriate gimpprint library)
print_version=`$PRINT_CONFIG --version`
if expr $print_version \>= $GIMPPRINT_REQUIRED_VERSION >/dev/null; then
if expr $print_version \< $GIMPPRINT_TOONEW_VERSION >/dev/null; then
if expr $print_version \>= gimpprint_required_version >/dev/null; then
if expr $print_version \< gimpprint_toonew_version >/dev/null; then
AC_MSG_RESULT([yes (version $print_version)])
have_gimp_print=yes
PRINT_LIBS=`$PRINT_CONFIG --libs`
......@@ -1026,12 +1045,12 @@ AC_ARG_ENABLE(print, [ --disable-print build without print support (req
AC_MSG_WARN([
*** libgimpprint version $print_version is too new.
*** It is likely an unstable development version.
*** You need a version before $GIMPPRINT_TOONEW_VERSION.])