Commit 55b115ac authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Require libtool-1.4, automake-1.4p1.

Sun May 13 12:01:12 2001  Owen Taylor  <otaylor@redhat.com>

        * autogen.sh (have_automake): Require libtool-1.4,
        automake-1.4p1.

        * acinclude.m4: Remove libtool macros.

        * gdk-pixbuf/Makefile.am: Add dependencies to loade
        modules.

        * gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
        for libgdk.

        * gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
        libgdk.la for libgtk.

        * modules/input/Makefile.am: Make modules have full
        dependencies.
parent 97fb7b78
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
Sun May 13 12:01:12 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (have_automake): Require libtool-1.4,
automake-1.4p1.
* acinclude.m4: Remove libtool macros.
* gdk-pixbuf/Makefile.am: Add dependencies to loade
modules.
* gdk/Makefile.am: Add dependency on libgdk_pixbuf.la
for libgdk.
* gtk/Makefile.am: Add dependency on libgdk_pixbuf.la
libgdk.la for libgtk.
* modules/input/Makefile.am: Make modules have full
dependencies.
Wed May 16 14:06:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): fix bug
......
This diff is collapsed.
......@@ -12,21 +12,49 @@ FILE=gdk
DIE=0
have_libtool=false
if libtool --version < /dev/null > /dev/null 2>&1 ; then
libtool_version=`libtoolize --version | libtoolize --version | sed 's/^[^0-9]*\([0-9.]\+\).*/\1/'`
case $libtool_version in
1.4*)
have_libtool=true
;;
esac
fi
if $have_libtool ; then : ; else
echo
echo "You must have libtool 1.4 installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
fi
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
echo "libtool the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
(automake --version) < /dev/null > /dev/null 2>&1 || {
have_automake=false
if automake --version < /dev/null > /dev/null 2>&1 ; then
automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
case $automake_version in
1.2*|1.3*|1.4)
;;
*)
have_automake=true
;;
esac
fi
if $have_automake ; then : ; else
echo
echo "You must have automake installed to compile $PROJECT."
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
echo "You must have automake 1.4-p1 installed to compile $PROJECT."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
fi
if test "$DIE" -eq 1; then
exit 1
......
Sun May 13 11:59:11 2001 Owen Taylor <otaylor@redhat.com>
* Makefile.am: Make modules depend on libgdk_pixbuf.la.
2001-05-04 Havoc Pennington <hp@redhat.com>
* pixops/pixops.c (pixops_process): merge fix from stable: Patch
......
......@@ -5,12 +5,14 @@ lib_LTLIBRARIES = \
loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
module_libs = libgdk_pixbuf-1.3.la $(GDK_PIXBUF_DEP_LIBS)
#
# The PNG plugin.
#
libpixbufloader_png_la_SOURCES = io-png.c
libpixbufloader_png_la_LDFLAGS = -avoid-version -module
libpixbufloader_png_la_LIBADD = $(LIBPNG)
libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs)
libpixbufloader_static_png_la_SOURCES = io-png.c
#
......@@ -19,7 +21,7 @@ libpixbufloader_static_png_la_SOURCES = io-png.c
libpixbufloader_static_jpeg_la_SOURCES = io-jpeg.c
libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs)
#
# The XPM loader
......@@ -27,7 +29,7 @@ libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
libpixbufloader_static_xpm_la_SOURCES = io-xpm.c
libpixbufloader_xpm_la_SOURCES = io-xpm.c
libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
libpixbufloader_xpm_la_LIBADD =
libpixbufloader_xpm_la_LIBADD = $(module_libs)
#
# The GIF loader
......@@ -35,7 +37,7 @@ libpixbufloader_xpm_la_LIBADD =
libpixbufloader_static_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
libpixbufloader_gif_la_LIBADD =
libpixbufloader_gif_la_LIBADD = $(module_libs)
#
# The ICO loader
......@@ -43,7 +45,7 @@ libpixbufloader_gif_la_LIBADD =
libpixbufloader_static_ico_la_SOURCES = io-ico.c
libpixbufloader_ico_la_SOURCES = io-ico.c
libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
libpixbufloader_ico_la_LIBADD =
libpixbufloader_ico_la_LIBADD = $(module_libs)
#
# The RAS loader
......@@ -51,7 +53,7 @@ libpixbufloader_ico_la_LIBADD =
libpixbufloader_static_ras_la_SOURCES = io-ras.c
libpixbufloader_ras_la_SOURCES = io-ras.c
libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
libpixbufloader_ras_la_LIBADD =
libpixbufloader_ras_la_LIBADD = $(module_libs)
#
# The TIFF loader
......@@ -59,7 +61,7 @@ libpixbufloader_ras_la_LIBADD =
libpixbufloader_static_tiff_la_SOURCES = io-tiff.c
libpixbufloader_tiff_la_SOURCES = io-tiff.c
libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
#
# The PNM loader
......@@ -67,7 +69,7 @@ libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
libpixbufloader_static_pnm_la_SOURCES = io-pnm.c
libpixbufloader_pnm_la_SOURCES = io-pnm.c
libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
libpixbufloader_pnm_la_LIBADD =
libpixbufloader_pnm_la_LIBADD = $(module_libs)
#
# The BMP loader
......@@ -75,7 +77,7 @@ libpixbufloader_pnm_la_LIBADD =
libpixbufloader_static_bmp_la_SOURCES = io-bmp.c
libpixbufloader_bmp_la_SOURCES = io-bmp.c
libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
libpixbufloader_bmp_la_LIBADD =
libpixbufloader_bmp_la_LIBADD = $(module_libs)
#
# The WBMP loader
......@@ -83,13 +85,15 @@ libpixbufloader_bmp_la_LIBADD =
libpixbufloader_static_wbmp_la_SOURCES = io-wbmp.c
libpixbufloader_wbmp_la_SOURCES = io-wbmp.c
libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module
libpixbufloader_wbmp_la_LIBADD = $(module_libs)
#
# The XBM loader
#
libpixbufloader_xbm_la_SOURCES = io-xbm.c
libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
libpixbufloader_xbm_la_LIBADD =
libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
libpixbufloader_xbm_la_LIBADD = $(module_libs)
if HAVE_PNG
PNG_LIB = libpixbufloader-png.la
......
......@@ -31,6 +31,7 @@ LDFLAGS = @STRIP_BEGIN@ \
-export-dynamic \
-rpath @prefix@/lib \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
@GDK_DEP_LIBS@ \
-lm \
@STRIP_END@
......
......@@ -30,6 +30,8 @@ LDFLAGS = @STRIP_BEGIN@ \
-export-dynamic \
-rpath @prefix@/lib \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
@GTK_DEP_LIBS@ \
@STRIP_END@
......
This diff is collapsed.
This diff is collapsed.
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