Commit e211f6f7 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

check for shm_open in libc too, and define RT_LIBS accordingly.

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

        * configure.in: check for shm_open in libc too, and define RT_LIBS
        accordingly.

        * gimptool-1.3.in
        * app/Makefile.am
        * libgimp/Makefile.am
        * plug-ins/*/Makefile.am
        * plug-ins/common/mkgen.pl: use RT_LIBS.
parent dfe0d687
2004-01-03 Manish Singh <yosh@gimp.org>
* configure.in: check for shm_open in libc too, and define RT_LIBS
accordingly.
* gimptool-1.3.in
* app/Makefile.am
* libgimp/Makefile.am
* plug-ins/*/Makefile.am
* plug-ins/common/mkgen.pl: use RT_LIBS.
2004-01-03 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell.c: some cosmetics while reviewing
......@@ -100,6 +100,7 @@ gimp_1_3_LDADD = \
$(FREETYPE_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(REGEXREPL)
......
......@@ -540,7 +540,7 @@ if test "x$platform_win32" = "xyes"; then
elif test "x$shmtype" = "xsysv"; then
AC_CHECK_HEADER(sys/ipc.h,
[AC_DEFINE(HAVE_IPC_H, 1,
[Define to 1 if you have the <sys/ipc.h> heacder file.])],
[Define to 1 if you have the <sys/ipc.h> header file.])],
no_sys_ipc=yes)
AC_CHECK_HEADER(sys/shm.h,
[AC_DEFINE(HAVE_SHM_H, 1,
......@@ -583,16 +583,30 @@ elif test "x$shmtype" = "xsysv"; then
shmtype=none
fi
elif test "x$shmtype" = "xposix"; then
AC_CHECK_LIB(rt, shm_open)
have_shm_open=no
AC_CHECK_FUNC(shm_open, have_shm_open=yes)
RT_LIBS=
if test "$have_shm_open" != "yes"; then
gimp_save_LIBS=$LIBS
LIBS=""
AC_CHECK_LIB(rt, shm_open, have_shm_open=yes)
RT_LIBS="$LIBS"
LIBS=$gimp_save_LIBS
fi
AC_SUBST(RT_LIBS)
AC_CHECK_HEADER(sys/mman.h,
[AC_DEFINE(HAVE_MMAN_H, 1,
[Define to 1 if you have the <sys/mman.h> heacder file.])],
[Define to 1 if you have the <sys/mman.h> header file.])],
no_sys_mman=yes)
if test "$ac_cv_func_mmap" = "yes" &&
test "$ac_cv_lib_rt_shm_open" = "yes" &&
test "$ac_cv_header_sys_mman_h" = "yes"; then
test "$ac_cv_header_sys_mman_h" = "yes" &&
test "$have_shm_open" = "yes"; then
AC_DEFINE(USE_POSIX_SHM, 1, [Define to 1 to use POSIX shared memory])
else
shmtype=none
......
......@@ -19,6 +19,8 @@ includedir=@includedir@
gimpplugindir=@gimpplugindir@
gimpdatadir=@gimpdatadir@
rt_libs=@RT_LIBS@
usage()
{
cat <<EOF
......@@ -200,13 +202,13 @@ while test $# -gt 0; do
done
case $1 in
--libs)
echo $libdirs -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs ;;
echo $libdirs -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs $rt_libs ;;
--libs-nogimpui)
echo $libdirs -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs ;;
echo $libdirs -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs $rt_libs ;;
esac
;;
--libs-noui)
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs $rt_libs
;;
--install-bin | --install-admin-bin \
| --install-bin-strip | --install-admin-bin-strip \
......
......@@ -19,6 +19,8 @@ includedir=@includedir@
gimpplugindir=@gimpplugindir@
gimpdatadir=@gimpdatadir@
rt_libs=@RT_LIBS@
usage()
{
cat <<EOF
......@@ -200,13 +202,13 @@ while test $# -gt 0; do
done
case $1 in
--libs)
echo $libdirs -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs ;;
echo $libdirs -lgimpui-@LT_RELEASE@ -lgimpwidgets-@LT_RELEASE@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs $rt_libs ;;
--libs-nogimpui)
echo $libdirs -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs ;;
echo $libdirs -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_gtk_libs $rt_libs ;;
esac
;;
--libs-noui)
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs $rt_libs
;;
--install-bin | --install-admin-bin \
| --install-bin-strip | --install-admin-bin-strip \
......
......@@ -243,7 +243,7 @@ libgimp_1_3_la_LDFLAGS = \
$(no_undefined) \
$(libgimp_export_symbols)
libgimp_1_3_la_LIBADD = $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS)
libgimp_1_3_la_LIBADD = $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS) $(RT_LIBS)
libgimp_1_3_la_DEPENDENCIES = $(gimp_def) $(libgimpcolor) $(libgimpbase)
......@@ -253,7 +253,7 @@ libgimpui_1_3_la_LDFLAGS = \
$(libgimpui_export_symbols)
libgimpui_1_3_la_LIBADD = $(libgimp) $(libgimpwidgets) $(libgimpcolor) \
$(libgimpbase) $(libgimpmodule) $(GTK_LIBS)
$(libgimpbase) $(libgimpmodule) $(GTK_LIBS) $(RT_LIBS)
libgimpui_1_3_la_DEPENDENCIES = $(gimpui_def) $(libgimp) $(libgimpwidgets) $(libgimpbase)
......
......@@ -32,4 +32,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -47,4 +47,5 @@ LDADD = \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -49,4 +49,5 @@ LDADD = \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -28,4 +28,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
This diff is collapsed.
......@@ -55,11 +55,10 @@ EXTRA_DIST = \\
INCLUDES = \\
-I\$(top_srcdir) \\
-I\$(top_srcdir)/plug-ins/libgimpoldpreview \\
\@GTK_CFLAGS\@ \\
\@X_CFLAGS\@ \\
\@EXIF_CFLAGS\@ \\
\@SVG_CFLAGS\@ \\
\@WMF_CFLAGS\@ \\
\$(GTK_CFLAGS) \\
\$(EXIF_CFLAGS) \\
\$(SVG_CFLAGS) \\
\$(WMF_CFLAGS) \\
-I\$(includedir)
libexec_PROGRAMS = \\
......@@ -70,7 +69,7 @@ $opts
install-\%: \%
\@\$(NORMAL_INSTALL)
\$(mkinstalldirs) \$(DESTDIRS)\$(libexecdir)
\$(mkinstalldirs) \$(DESTDIR)\$(libexecdir)
\@if test -f \$<; then \\
echo " \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) \$< \$(DESTDIR)\$(libexecdir)/`echo \$<|sed 's/\$(EXEEXT)\$\$//'|sed '\$(transform)'|sed 's/\$\$/\$(EXEEXT)/'`"; \\
\$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) \$< \$(DESTDIR)\$(libexecdir)/`echo \$<|sed 's/\$(EXEEXT)\$\$//'|sed '\$(transform)'|sed 's/\$\$/\$(EXEEXT)/'`; \\
......@@ -105,11 +104,11 @@ foreach (sort keys %plugins) {
$optlib = "\n\t\$(LIB\U$name\E)\t\t\t\t\t\t\t\\";
}
my $deplib = "\@INTLLIBS\@";
my $deplib = "\$(RT_LIBS)\t\t\t\t\t\t\t\\\n\t\$(INTLLIBS)";
if (exists $plugins{$_}->{libdep}) {
my @lib = split(/:/, $plugins{$_}->{libdep});
foreach $lib (@lib) {
$deplib = "\@\U$lib\E_LIBS\@\t\t\t\t\t\t\t\\\n\t$deplib";
$deplib = "\$(\U$lib\E_LIBS)\t\t\t\t\t\t\t\\\n\t$deplib";
}
}
......
......@@ -29,4 +29,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -26,4 +26,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -27,4 +27,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -34,5 +34,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(LIBUCB) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -29,4 +29,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -55,4 +55,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -26,4 +26,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -27,4 +27,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -54,6 +54,7 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......
......@@ -27,4 +27,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTKHTML2_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -30,4 +30,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -147,6 +147,7 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
CLEANFILES = y.tab.c y.tab.h
......
......@@ -29,4 +29,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -34,4 +34,5 @@ LDADD = \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -25,4 +25,5 @@ LDADD = \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(PRINT_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -23,7 +23,8 @@ gimpmodule_la_LIBADD = \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GLIB_LIBS)
$(GLIB_LIBS) \
$(RT_LIBS)
pygimp_PYTHON = \
gimpplugin.py \
......
......@@ -40,4 +40,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -13,20 +13,20 @@ libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = script-fu
script_fu_SOURCES = \
script-fu.c \
script-fu-console.c \
script-fu-console.h \
script-fu-text-console.h\
script-fu-text-console.c\
script-fu-constants.c \
script-fu-constants.h \
script-fu-intl.h \
script-fu-scripts.c \
script-fu-scripts.h \
script-fu-server.c \
script-fu-server.h \
script-fu-enums.h \
siod-wrapper.c \
script-fu.c \
script-fu-console.c \
script-fu-console.h \
script-fu-text-console.h \
script-fu-text-console.c \
script-fu-constants.c \
script-fu-constants.h \
script-fu-intl.h \
script-fu-scripts.c \
script-fu-scripts.h \
script-fu-server.c \
script-fu-server.h \
script-fu-enums.h \
siod-wrapper.c \
siod-wrapper.h
INCLUDES = \
......@@ -50,5 +50,6 @@ LDADD = \
siod/libsiod.a \
$(GTK_LIBS) \
$(SOCKET_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(REGEXREPL)
......@@ -48,4 +48,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -27,4 +27,5 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -31,5 +31,6 @@ LDADD = \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
-luser32
......@@ -30,6 +30,7 @@ LDADD = \
winsnap-win32res.o \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(RT_LIBS) \
$(GTK_LIBS) \
$(INTLLIBS)
......
......@@ -25,5 +25,6 @@ LDADD = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(RT_LIBS) \
$(LIBJPEG) \
$(INTLLIBS)
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