Commit Graph

22 Commits

Author SHA1 Message Date
Martin Nordholts 53596f708d m4macros: Delete gtk-doc.m4, gtkdocize gives us a symlink 2010-06-19 23:55:35 +02:00
Sven Neumann 6601625af7 Add AC_CONFIG_MACRO_DIR() to configure.ac as suggested by libtoolize
Also set ACLOCAL_AMFLAGS in the top-level Makefile.am and update
the .gitignore file in the m4macros directory. This fixes the build
from a fresh checkout for me. Please revert if it causes problems.
2010-02-01 00:09:11 +01:00
Martin Nordholts 4d7a6b10d1 Added .gitignore files generated with git svn create-ignore.
svn path=/trunk/; revision=27972
2009-01-31 11:37:44 +00:00
Sven Neumann 930d6149da removed all .cvsignore files from SVN
svn path=/trunk/; revision=21612
2006-12-30 14:31:03 +00:00
Manish Singh d0729e4cc1 introduce automake conditional USE_BINRELOC.
2006-02-19  Manish Singh  <yosh@gimp.org>

        * m4macros/binreloc.m4: introduce automake conditional USE_BINRELOC.

        * app/Makefile.am: ... and use the above here, so that -rpath is only
        specified when binreloc functionality is enabled. Fixes bug #331677.
2006-02-19 17:44:57 +00:00
Michael Natterer 969fcb2475 disable binreloc by default.
2005-11-11  Michael Natterer  <mitch@gimp.org>

	* m4macros/binreloc.m4: disable binreloc by default.
2005-11-11 15:22:49 +00:00
Sven Neumann 39e866d9c0 Added support for binary relocation by means of binreloc, largely based on
2005-11-06  Sven Neumann  <sven@gimp.org>

	Added support for binary relocation by means of binreloc, largely
	based on a patch by Hongli Lai:

	* m4macros/Makefile.am
	* m4macros/binreloc.m4: new file providing a macro to check for
	binreloc support.

	* acinclude.m4
	* configure.in: use the macro.

	* libgimpbase/Makefile.am
	* libgimpbase/gimpreloc.[ch]: new files providing binreloc support
	on Linux.

	* libgimpbase/gimpenv.[ch]: use binreloc, provide a function to
	initialize the environment machinery.

	* libgimpbase/gimpbase.def: updated.

	* app/Makefile.am: fiddle with the LDFLAGS for binreloc.

	* app/main.c (main): gimp_env_init(FALSE).

	* libgimp/gimp.c (gimp_main): gimp_env_init(TRUE).
2005-11-06 01:06:41 +00:00
Manish Singh 19ea886842 python headers on Win32 don't live in a versioned subdir. Handle that
2005-08-28  Manish Singh  <yosh@gimp.org>

        * m4macros/pythondev.m4: python headers on Win32 don't live in a
        versioned subdir. Handle that case.
2005-08-28 16:59:56 +00:00
Jens Seidel d08ae844d3 fixed a typo: s/occured/occurred/g 2005-08-21 20:28:05 +00:00
Manish Singh b55753bb21 acinclude.m4 m4macros/Makefile.am new macro: GIMP_DETECT_CFLAGS; used to
2005-07-31  Manish Singh  <yosh@gimp.org>

        * acinclude.m4
        * m4macros/Makefile.am
        * m4macros/detectcflags.m4: new macro: GIMP_DETECT_CFLAGS; used
        to detect which of a set of compiler options a compiler supports.

        * configure.in: use the above for the altivec and -fno-strict-aliasing
        flags. Also, use it to detect the presence of -mmmx and -msse, since
        those are needed to compile even MMX/SSE assembly with gcc 4.0. Define
        MMX/SSE_EXTRA_CFLAGS.

        * app/composite/Makefile.am: compile each of the composite flavors
        into their own library, so we can use automake's per-target CFLAGS.
        Use MMX/SSE/ALTIVEC_EXTRA_CFLAGS in the appropriate places. Build
        libappcomposite.a out of the resulting objects.

        * app/composite/gimp-composite-3dnow.c
        * app/composite/gimp-composite-altivec.c
        * app/composite/gimp-composite-mmx.c
        * app/composite/gimp-composite-sse.c
        * app/composite/gimp-composite-sse2.c
        * app/composite/gimp-composite-vis.c
        * app/composite/make-installer.py: move the _init functions into
        the installers, so only actually mmx/sse/etc. code gets compiled
        under the appropriate CFLAGS.

        * app/composite/gimp-composite-3dnow-installer.c
        * app/composite/gimp-composite-altivec-installer.c
        * app/composite/gimp-composite-mmx-installer.c
        * app/composite/gimp-composite-sse-installer.c
        * app/composite/gimp-composite-sse2-installer.c
        * app/composite/gimp-composite-vis-installer.c: regenerated.

        * app/composite/gimp-composite.c: remove useless cpu-accel.h include.
2005-08-01 04:45:34 +00:00
Manish Singh cbee4c51de split out into separate files...
2005-06-24  Manish Singh  <yosh@gimp.org>

        * acinclude.m4: split out into separate files...

        * m4macros/alsa.m4
        * m4macros/gimpprint.m4
        * m4macros/gtk-doc.m4
        * m4macros/pythondev.m4: ... and put them here.

        * m4macros/Makefile.am: dist the above files.
2005-06-24 21:17:57 +00:00
Michael Natterer e0d1ddb070 added run-time version check and do the workaround for bug #136636 only if
2004-03-21  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_events): added run-time version
	check and do the workaround for bug #136636 only if
	the Gtk+ version is < 2.2.5.

	* m4macros/gimp-2.0.m4: require gimp >= 2.0.0
2004-03-21 15:58:48 +00:00
Michael Natterer e8843a2372 reset binary age because of struct changes below. require GIMP 1.3.26.
2004-01-29  Michael Natterer  <mitch@gimp.org>

	* configure.in: reset binary age because of struct changes below.
	* m4macros/gimp-2.0.m4: require GIMP 1.3.26.

	* libgimpmodule/gimpmodule.h
	* libgimpmodule/gimpmoduledb.h
	* libgimpthumb/gimpthumbnail.h
	* libgimpwidgets/gimpbutton.h
	* libgimpwidgets/gimpchainbutton.h
	* libgimpwidgets/gimpcolorarea.h
	* libgimpwidgets/gimpcolorbutton.h
	* libgimpwidgets/gimpcolordisplay.h
	* libgimpwidgets/gimpcolordisplaystack.h
	* libgimpwidgets/gimpcolornotebook.h
	* libgimpwidgets/gimpcolorscale.h
	* libgimpwidgets/gimpcolorselection.h
	* libgimpwidgets/gimpcolorselector.h
	* libgimpwidgets/gimpdialog.h
	* libgimpwidgets/gimpfileentry.h
	* libgimpwidgets/gimpmemsizeentry.h
	* libgimpwidgets/gimpoffsetarea.h
	* libgimpwidgets/gimppickbutton.h
	* libgimpwidgets/gimppixmap.h
	* libgimpwidgets/gimpsizeentry.h
	* libgimpwidgets/gimpunitmenu.h: added 4 function pointers padding
	to all class structures.
2004-01-29 00:21:33 +00:00
Manish Singh d87468730b quote AM_PATH_GIMP_2_O properly so automake 1.8 won't whine at us.
2004-01-21  Manish Singh  <yosh@gimp.org>

        * m4macros/gimp-2.0.m4: quote AM_PATH_GIMP_2_O properly so automake
        1.8 won't whine at us.
2004-01-22 04:27:15 +00:00
Sven Neumann bd5827d0d9 bumped version number to 1.3.25, interface_age 1, binary age 1.
2004-01-09  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped version number to 1.3.25, interface_age 1,
	binary age 1.

	* Makefile.am
	* gimp-2.0.pc.in
	* gimpthumb-2.0.pc.in
	* gimpui-2.0.pc.in: renamed the pkg-config files.

	* gimptool-2.0.in
	* docs/Makefile.am
	* docs/gimptool-2.0.1.in: renamed gimptool and it's manpage.

	* gimp.spec.in
	* m4macros/gimp-2.0.m4: changed accordingly.
2004-01-09 00:09:51 +00:00
Sven Neumann 6041392138 gimp-1.3.pc.in don't use $VERSION because pkg-config and the like don't
2004-01-07  Sven Neumann  <sven@gimp.org>

	* gimp-1.3.pc.in
	* gimpui-1.3.pc.in: don't use $VERSION because pkg-config and the
	like don't like the 2.0pre version numbers. Instead create a
	parseable version number from major, minor and micro version.

	* m4macros/gimp-2.0.m4: check for 1.3.24 or newer.
2004-01-07 19:52:46 +00:00
Sven Neumann 5795f10ad3 rewritten to use pkg-config instead of gimptool; closely modeled after
2003-11-02  Sven Neumann  <sven@gimp.org>

	* m4macros/gimp-2.0.m4: rewritten to use pkg-config instead of
	gimptool; closely modeled after gtk-2.0.m4.
2003-11-02 18:49:41 +00:00
Sven Neumann 5ab05db882 set the default minimum version to 1.3.18.
2003-08-21  Sven Neumann  <sven@gimp.org>

	* m4macros/gimp-2.0.m4: set the default minimum version to 1.3.18.
2003-08-21 09:50:23 +00:00
Sven Neumann 1ea55851c3 changed the gettext domain prefix to gimp20.
2003-07-20  Sven Neumann  <sven@gimp.org>

	* configure.in: changed the gettext domain prefix to gimp20.

	* m4macros/Makefile.am
	* m4macros/gimp-1.4.m4: removed this file ...
	* m4macros/gimp-2.0.m4: ... and readded it with a new name.
	Changed the macro to AM_PATH_GIMP_2_0().

	* configure.in: added --without-aa option as a way to work around
	broken aalib installations.

	* INSTALL: document --without-aa and --without-mng.
2003-07-20 12:40:30 +00:00
Sven Neumann fdc31ec7d0 use gimptool-1.3.
2001-11-29  Sven Neumann  <sven@gimp.org>

	* m4macros/gimp-1.4.m4: use gimptool-1.3.

	* app/display/gimpdisplayshell.c
	* app/gui/gui.c: cosmetic changes from Guillermo S. Romero.

	* plug-ins/common/*.c
	* plug-ins/script-fu/script-fu-scripts.c: applied patches from
	Guillermo S. Romero that change the button ordering. I had to redo
	some of the changes by hand since the patches didn't apply cleanly.
	Hopefully got it all right...
2001-11-29 13:23:44 +00:00
Michael Natterer 3413a9ef3c small fix.
2001-11-12  Michael Natterer  <mitch@gimp.org>

	* HACKING: small fix.

	* configure.in: changed --disable-perl to --enable-perl because
	it doesn't build properly at the moment.

	* pixmaps/Makefile.am: removed stuff which is no longer there
	from EXTRA_DIST.

	* plug-ins/Makefile.am: put back the $(GIMP_PERL) line in SUBDIRS.

	* app/widgets/gimpmenuitem.c. include "libgimpwidgets/gimpwidgets.h".

	* data/Makefile.am
	* data/brushes/Makefile.am
	* data/gradients/Makefile.am
	* data/palettes/Makefile.am
	* data/patterns/Makefile.am: removed the old "files" hack and put
	the stuff to EXTRA_DIST.

	* app/Makefile.am
	* app/base/Makefile.am
	* app/core/Makefile.am
	* app/file/Makefile.am
	* app/gui/Makefile.am
	* app/paint-funcs/Makefile.am
	* app/pdb/Makefile.am
	* app/tools/Makefile.am
	* app/widgets/Makefile.am
	* app/widgets/gimpmenuitem.c
	* app/xcf/Makefile.am
	* cursors/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am
	* libgimpcolor/Makefile.am
	* libgimpmath/Makefile.am
	* libgimpwidgets/Makefile.am
	* m4macros/Makefile.am
	* themes/Makefile.am
	* themes/Default/Makefile.am
	* themes/Default/images/Makefile.am
	* themes/Default/images/tools/Makefile.am: removed "files" target.
2001-11-13 01:46:10 +00:00
Sven Neumann cae946baaf removed redefinitions of libtool macros. We use the installed libtool now.
2001-08-28  Sven Neumann  <sven@gimp.org>

	* acinclude.m4: removed redefinitions of libtool macros. We use the
	installed libtool now. If this breaks the build for your system,
	upgrade libtool. If that does not help, let us know.

	* ltconfig
	* ltmain.sh: removed these files. Newer versions of libtool don't use
	ltconfig and ltmain.sh is taken from your libtool installation.

	* autogen.sh: check for presence of libtool.

	* Makefile.am
	* configure.in
	* gimp-remote.1.in
	* gimp.1.in
	* gimprc.5.in: removed man-pages from toplevel dir ...

	* docs/Makefile.am
	* docs/gimp-remote.1.in
	* docs/gimp.1.in
	* docs/gimprc.5.in
	* docs/gimptool-1.4.1.in: ... and added them back here.

	* gimp-1.4.m4: removed from toplevel dir ...

	* m4macros/Makefile.am
	* m4macros/gimp-1.4.m4: ... and added it back here.
2001-08-28 13:04:47 +00:00