mirror of https://github.com/GNOME/gimp.git
fixed variable clobber for thread & MP options added new
* configure.in: fixed variable clobber for thread & MP options * app/Makefile.am: added new GIMP_MP_{LIBS,FLAGS} to compile & link flags The old configure would set the thread libs and then immediately clobber them unless you enabled MP support. This meant threads but no MP would mean a no-compile if your pthread support is in a separate library (not in libc). -sg
This commit is contained in:
parent
3e744074e9
commit
6b1b43d3b4
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
1999-05-12 Scott Goehring <scott@poverty.bloomington.in.us>
|
||||
|
||||
* configure.in: fixed variable clobber for thread & MP options
|
||||
* app/Makefile.am: added new GIMP_MP_{LIBS,FLAGS} to compile &
|
||||
link flags
|
||||
|
||||
The old configure would set the thread libs and then immediately
|
||||
clobber them unless you enabled MP support. This meant threads
|
||||
but no MP would mean a no-compile if your pthread support is in a
|
||||
separate library (not in libc).
|
||||
|
||||
1999-05-13 Martin Baulig <martin@home-of-linux.org>
|
||||
|
||||
* plug-ins/screenshot/screenshot.c: Make the "after ... seconds"
|
||||
|
|
|
@ -391,7 +391,8 @@ AM_CPPFLAGS = \
|
|||
-DLIBDIR=\""$(gimpplugindir)"\" \
|
||||
-DLOCALEDIR=\""$(localedir)"\" \
|
||||
-DREGEX_MALLOC \
|
||||
@GIMP_THREAD_FLAGS@
|
||||
@GIMP_THREAD_FLAGS@ \
|
||||
@GIMP_MP_FLAGS@
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
|
@ -404,6 +405,7 @@ gimp_LDADD = \
|
|||
$(top_builddir)/libgimp/libgimpi.a \
|
||||
$(GTK_LIBS) \
|
||||
$(GIMP_THREAD_LIBS) \
|
||||
$(GIMP_MP_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
DEPS = \
|
||||
|
|
12
configure.in
12
configure.in
|
@ -432,17 +432,17 @@ fi
|
|||
|
||||
dnl Multi-Processor Support
|
||||
AC_ARG_WITH(mp, [ --with-mp=[no] support multiple processors ])
|
||||
GIMP_THREAD_LIBS=
|
||||
GIMP_MP_LIBS=
|
||||
if test "x$with_mp" = "xyes"; then
|
||||
AC_CHECK_LIB(pthread, pthread_attr_init,
|
||||
[AC_DEFINE(ENABLE_MP)
|
||||
GIMP_THREAD_LIBS="-lpthread"
|
||||
GIMP_THREAD_FLAGS="-D_REENTRANT"],
|
||||
GIMP_MP_LIBS="-lpthread"
|
||||
GIMP_MP_FLAGS="-D_REENTRANT"],
|
||||
# AIX has libpthreads, cause they're special. Special friends (TM)
|
||||
AC_CHECK_LIB(pthreads, pthread_attr_init,
|
||||
[AC_DEFINE(ENABLE_MP)
|
||||
GIMP_THREAD_LIBS="-lpthreads"
|
||||
GIMP_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
|
||||
GIMP_MP_LIBS="-lpthreads"
|
||||
GIMP_MP_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
|
||||
fi
|
||||
|
||||
gimpdatadir=$datadir/gimp
|
||||
|
@ -626,6 +626,8 @@ AC_SUBST(LPC_DEF)
|
|||
AC_SUBST(MAILER)
|
||||
AC_SUBST(GIMP_THREAD_FLAGS)
|
||||
AC_SUBST(GIMP_THREAD_LIBS)
|
||||
AC_SUBST(GIMP_MP_FLAGS)
|
||||
AC_SUBST(GIMP_MP_LIBS)
|
||||
AC_SUBST(GIMP_PERL)
|
||||
AC_SUBST(GIMPDOCS)
|
||||
|
||||
|
|
Loading…
Reference in New Issue