diff --git a/ChangeLog b/ChangeLog index 7c75cf1..055b3cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2950,3 +2950,13 @@ Tue Jan 15 15:22:06 EST 2002 Fixed a whole slew of potential buffer overflows, hopefully including the one recently posted to BUGTRAQ. +_______________________________________________ + +Mon Mar 31 15:20:43 EST 2003 +(KainX) + +Finally got around to fixing the build. Having Imlib2 already installed +should no longer be necessary to build it. + +_______________________________________________ + diff --git a/autogen.sh b/autogen.sh index 3769154..7231884 100755 --- a/autogen.sh +++ b/autogen.sh @@ -36,10 +36,6 @@ for EACHDIR in $SUBDIRS ; do autoheader || abort "autoheader" automake --foreign --add-missing || abort "automake" autoconf || abort "autoconf" - (cd libltdl && aclocal) || abort "in libltdl, aclocal" - (cd libltdl && autoheader) || abort "in libltdl, autoheader" - (cd libltdl && automake --add-missing) || abort "in libltdl, automake" - (cd libltdl && autoconf) || abort "in libltdl, autoconf" done if test -z "$*"; then diff --git a/configure.in b/configure.in index a6ca2aa..fedb969 100644 --- a/configure.in +++ b/configure.in @@ -124,8 +124,6 @@ echo "ftp://ftp.enlightenment.org/pub/enlightenment/" echo "ftp://www.rasterman.com/pub/enlightenment/" echo "You can also obtain it from:" echo "http://www.freetype.org/" -echo "You can obtain some truetype fonts from:" -echo "http://voyager.cns.ohiou.edu/~sadkins/web_library/fonts/font_archive/" echo "" AC_MSG_ERROR([Fatal Error: no FreeType detected.])], -lm) diff --git a/demo/Makefile.am b/demo/Makefile.am index 1cfd35a..aa95f95 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -14,5 +14,5 @@ INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \ bin_PROGRAMS = imlib2_view imconvert imconvert_SOURCES = imconvert.c imlib2_view_SOURCES = view.c -LDADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ - $(x_libs) -lttf -lImlib2 +LIBADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ + $(x_libs) -lttf $(top_builddir)/src/libImlib2.la diff --git a/filters/Makefile.am b/filters/Makefile.am index 87b7daf..b8b7930 100644 --- a/filters/Makefile.am +++ b/filters/Makefile.am @@ -14,14 +14,14 @@ INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \ pkgdir = $(libdir)/loaders/filter pkg_LTLIBRARIES = testfilter.la bump_map.la colormod.la -testfilter_la_SOURCES = filter_test.c -testfilter_la_LDFLAGS = -no-undefined -module -avoid-version -testfilter_la_LIBADD = +testfilter_la_SOURCES = filter_test.c +testfilter_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +testfilter_la_LIBADD = bump_map_la_SOURCES = filter_bumpmap.c -bump_map_la_LDFLAGS = -no-undefined -module -avoid-version -bump_map_la_LIBADD = +bump_map_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +bump_map_la_LIBADD = colormod_la_SOURCES = filter_colormod.c -colormod_la_LDFLAGS = -no-undefined -module -avoid-version -colormod_la_LIBADD = +colormod_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +colormod_la_LIBADD = diff --git a/loaders/Makefile.am b/loaders/Makefile.am index 3accc21..cc1e7f3 100644 --- a/loaders/Makefile.am +++ b/loaders/Makefile.am @@ -34,41 +34,41 @@ $(GIF_L) \ pnm.la argb.la bmp.la xpm.la tga.la gzbz2.la jpeg_la_SOURCES = loader_jpeg.c -jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src +jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +jpeg_la_LIBADD = @JPEGLIBS@ png_la_SOURCES = loader_png.c -png_la_LDFLAGS = -no-undefined -module -avoid-version -png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src +png_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +png_la_LIBADD = @PNGLIBS@ tiff_la_SOURCES = loader_tiff.c -tiff_la_LDFLAGS = -no-undefined -module -avoid-version -tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src +tiff_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +tiff_la_LIBADD = @TIFFLIBS@ gif_la_SOURCES = loader_gif.c -gif_la_LDFLAGS = -no-undefined -module -avoid-version -gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src +gif_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +gif_la_LIBADD = @GIFLIBS@ pnm_la_SOURCES = loader_pnm.c -pnm_la_LDFLAGS = -no-undefined -module -avoid-version -pnm_la_LIBADD = -L$(top_builddir)/src +pnm_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +pnm_la_LIBADD = argb_la_SOURCES = loader_argb.c -argb_la_LDFLAGS = -no-undefined -module -avoid-version -argb_la_LIBADD = -L$(top_builddir)/src +argb_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +argb_la_LIBADD = bmp_la_SOURCES = loader_bmp.c -bmp_la_LDFLAGS = -no-undefined -module -avoid-version -bmp_la_LIBADD = -L$(top_builddir)/src +bmp_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +bmp_la_LIBADD = xpm_la_SOURCES = loader_xpm.c -xpm_la_LDFLAGS = -no-undefined -module -avoid-version -xpm_la_LIBADD = -L$(top_builddir)/src +xpm_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +xpm_la_LIBADD = tga_la_SOURCES = loader_tga.c -tga_la_LDFLAGS = -no-undefined -module -avoid-version -tga_la_LIBADD = -L$(top_builddir)/src +tga_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +tga_la_LIBADD = -gzbz2_la_SOURCES = loader_gzbz2.c -gzbz2_la_LDFLAGS = -no-undefined -module -avoid-version -gzbz2_la_LIBADD = -L$(top_builddir)/src +gzbz2_la_SOURCES = loader_gzbz2.c +gzbz2_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +gzbz2_la_LIBADD = diff --git a/test/Makefile.am b/test/Makefile.am index c9dc673..afda028 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -14,21 +14,20 @@ INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \ bin_PROGRAMS = imlib2 bumpmaptest imlib2_test polytest color_spaces imlib2_SOURCES = main.c imlib2_LDADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ - $(x_libs) -lttf -lImlib2 -lm - + $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm + bumpmaptest_SOURCES = bmtest.c bumpmaptest_LDADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ - $(x_libs) -lttf -lImlib2 -lm + $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm imlib2_test_SOURCES = imlib2_test.c imlib2_test_LDADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ - $(x_libs) -lttf -lImlib2 -lm + $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm polytest_SOURCES = polytest.c polytest_LDADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ - $(x_libs) -lttf -lImlib2 -lm + $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm color_spaces_SOURCES = color_spaces.c color_spaces_LDADD = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \ - $(x_libs) -lttf -lImlib2 -lm - + $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm