dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added -lX11 to LIBXMU since GTK_LIBS doesn't provide it for us anymore 

2002-05-30  Sven Neumann  <sven@gimp.org>

	* configure.in: added -lX11 to LIBXMU since GTK_LIBS doesn't provide
	it for us anymore (reported by Tomas Ogren).

	* libgimpbase/gimpenv.[ch]: declare gimp_path_runtime_fix() static.

	* app/base/Makefile.am: conditionally build detect-mmx.S to avoid
	warnings about empty object files (reported by Tomas Ogren).

	* plug-ins/Makefile.am: commented out plugin-helper since it's just
	too broken to be distributed.

	* themes/Default/images/Makefile.am: echo -n is not portable and not
	needed, so removed it (reported by Tomas Ogren).
This commit is contained in:
Sven Neumann 2002-05-30 02:13:11 +00:00 committed by Sven Neumann
parent 0633d0c09b
commit 892d319eae
8 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2002-05-30 Sven Neumann <sven@gimp.org>
* configure.in: added -lX11 to LIBXMU since GTK_LIBS doesn't provide
it for us anymore (reported by Tomas Ogren).
* libgimpbase/gimpenv.[ch]: declare gimp_path_runtime_fix() static.
* app/base/Makefile.am: conditionally build detect-mmx.S to avoid
warnings about empty object files (reported by Tomas Ogren).
* plug-ins/Makefile.am: commented out plugin-helper since it's just
too broken to be distributed.
* themes/Default/images/Makefile.am: echo -n is not portable and not
needed, so removed it (reported by Tomas Ogren).
2002-05-30 Sven Neumann <sven@gimp.org>
* app/gui/gui.c (gui_get_screen_resolution): do some sanity checks

6
NEWS
View File

@ -8,6 +8,12 @@ development takes place on the road to the next stable release
dubbed GIMP 1.4.
Overview of Changes in GIMP 1.3.7
=================================
- Build fixes.
- Bug fixes.
Overview of Changes in GIMP 1.3.6
=================================
- Support tile cache > 4GB on machines with 64bit long integers [Sven]

20
app/base/Makefile.am
View File

@ -2,6 +2,12 @@
noinst_LIBRARIES = libappbase.a
if HAVE_ASM_MMX
mmx_sources = detect-mmx.S
else
mmx_sources =
endif
libappbase_a_SOURCES = @STRIP_BEGIN@ \
base.c \
base.h \
@ -14,7 +20,7 @@ libappbase_a_SOURCES = @STRIP_BEGIN@ \
boundary.h \
brush-scale.c \
brush-scale.h \
detect-mmx.S \
$(mmx_sources) \
detect-mmx.h \
gimphistogram.c \
gimphistogram.h \
@ -53,11 +59,15 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
AM_ASFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/app
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
#

8
configure.in
View File

@ -552,15 +552,15 @@ if test "$gdk_target" = x11; then
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
GIMP_REMOTE='gimp-remote-1.3';
WEBBROWSER='webbrowser';
LIBXMU="$X_LIBS -lXmu -lXt -lSM -lICE",
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[AC_MSG_WARN(*** webbrowser plug-in and 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';
WEBBROWSER='webbrowser';
LIBXMU="$X_LIBS -lXmu -lXt",
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU header file not found) ***)])],
AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU library not found) ***), -lXt)], -lXt -lSM -lICE)
AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU library not found) ***), -lXt)], -lXt)
LDFLAGS="$gimp_save_LDFLAGS"
fi
else
@ -1063,6 +1063,7 @@ dnl plug-ins/perl/config.pl
dnl plug-ins/gap/Makefile
dnl plug-ins/gdyntext/Makefile
dnl plug-ins/perl/po/Makefile.in
dnl plug-ins/plugin-helper/Makefile
dnl plug-ins/tools/common/Makefile
AC_OUTPUT([
@ -1140,7 +1141,6 @@ plug-ins/print/Makefile
plug-ins/rcm/Makefile
plug-ins/sel2path/Makefile
plug-ins/sgi/Makefile
plug-ins/plugin-helper/Makefile
plug-ins/tools/Makefile
modules/Makefile
modules/makefile.mingw

6
libgimpbase/gimpenv.c
View File

@ -375,7 +375,8 @@ gimp_gtkrc (void)
/**
* gimp_path_runtime_fix:
* @path: A pointer to a string (allocated with g_malloc) that is (or could be) a pathname.
* @path: A pointer to a string (allocated with g_malloc) that is
* (or could be) a pathname.
*
* On Windows, this function checks if the string pointed to by @path
* starts with the compile-time prefix, and in that case, replaces the
@ -387,8 +388,7 @@ gimp_gtkrc (void)
*
* On Unix, does nothing.
*/
void
static void
gimp_path_runtime_fix (gchar **path)
{
#if defined (G_OS_WIN32) && defined (PREFIX)

2
libgimpbase/gimpenv.h
View File

@ -32,7 +32,7 @@ G_BEGIN_DECLS
const gchar * gimp_directory (void) G_GNUC_CONST;
const gchar * gimp_data_directory (void) G_GNUC_CONST;
const gchar * gimp_locale_directory (void) G_GNUC_CONST;
const gchar * gimp_locale_directory (void) G_GNUC_CONST;
const gchar * gimp_sysconf_directory (void) G_GNUC_CONST;
const gchar * gimp_plug_in_directory (void) G_GNUC_CONST;
const gchar * gimp_gtkrc (void) G_GNUC_CONST;

2
plug-ins/Makefile.am
View File

@ -57,9 +57,9 @@ SUBDIRS = \
sel2path \
$(WEBBROWSER) \
$(XJT) \
plugin-helper \
common \
tools
## plugin-helper \
## gap \
## gdyntext \

2
themes/Default/images/Makefile.am
View File

@ -153,7 +153,7 @@ CLEANFILES = $(noinst_DATA) stock-icons.list
stock-icons.list: $(STOCK_IMAGES) Makefile.am
( rm -f $@; \
for image in $(STOCK_IMAGES); do \
echo -n $$image | \
echo $$image | \
sed -e 's|.*/||' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
echo " $(srcdir)/$$image" >> $@; \
done )