and make them build.......... PROPERLY!

SVN revision: 3423

configure.in

@@ -311,27 +311,12 @@ Fatal Error: No EDB Headers AND Library detected.
 	     All other loaders are optional])
 fi
 
-if test "$jpeg_ok" = yes; then
-  JPEG_LA=loader_jpeg.c
-fi
-if test "$png_ok" = yes; then
-  PNG_LA=loader_png.c
-fi
-if test "$edb_ok" = yes; then
-  EDB_LA=loader_db.c
-fi
-if test "$tiff_ok" = yes; then
-  TIFF_LA=loader_tiff.c
-fi
-if test "$gif_ok" = yes; then
-  GIF_LA=loader_gif.c
-fi
+AM_CONDITIONAL(JPEG_LOADER, test "$jpeg_ok" = yes)
+AM_CONDITIONAL(PNG_LOADER, test "$png_ok" = yes)
+AM_CONDITIONAL(EDB_LOADER, test "$edb_ok" = yes)
+AM_CONDITIONAL(TIFF_LOADER, test "$tiff_ok" = yes)
+AM_CONDITIONAL(GIF_LOADER, test "$gif_ok" = yes)
 
-AC_SUBST(JPEG_LA)
-AC_SUBST(PNG_LA)
-AC_SUBST(EDB_LA)
-AC_SUBST(TIFF_LA)
-AC_SUBST(GIF_LA)
 AC_SUBST(JPEGLIBS)
 AC_SUBST(PNGLIBS)
 AC_SUBST(EDBLIBS)

loaders/Makefile.am

@@ -12,27 +12,60 @@ INCLUDES	     = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
 		       -I$(top_srcdir)/loaders
 
 pkgdir		     = $(libdir)/loaders/image
-pkg_LTLIBRARIES	     = jpeg.la png.la db.la gif.la tiff.la pnm.la argb.la bmp.la xpm.la tga.la #xcf.la
 
-jpeg_la_SOURCES	     = @JPEG_LA@
+if JPEG_LOADER
+JPEG_L              = jpeg.la
+endif
+if PNG_LOADER
+PNG_L               = png.la
+endif
+if EDB_LOADER
+EDB_L               = db.la
+endif
+if TIFF_LOADER
+TIFF_L              = tiff.la
+endif
+if GIF_LOADER
+GIF_L               = gif.la
+endif
+
+pkg_LTLIBRARIES	     = \
+$(JPEG_L) \
+$(PNG_L) \
+$(EDB_L) \
+$(TIFF_L) \
+$(GIF_L) \
+pnm.la argb.la bmp.la xpm.la tga.la #xcf.la
+
+if JPEG_LOADER
+jpeg_la_SOURCES	     = loader_jpeg.c
 jpeg_la_LDFLAGS	     = -no-undefined -module -avoid-version
 jpeg_la_LIBADD	     = @JPEGLIBS@
+endif
 
-png_la_SOURCES	     = @PNG_LA@
+if PNG_LOADER
+png_la_SOURCES	     = loader_png.c
 png_la_LDFLAGS	     = -no-undefined -module -avoid-version
 png_la_LIBADD	     = @PNGLIBS@
+endif
 
-db_la_SOURCES        = @EDB_LA@
+if EDB_LOADER
+db_la_SOURCES        = loader_db.c
 db_la_LDFLAGS	     = -no-undefined -module -avoid-version
 db_la_LIBADD	     = @EDBLIBS@ -lz
+endif
 
-tiff_la_SOURCES	     = @TIFF_LA@
+if TIFF_LOADER
+tiff_la_SOURCES	     = loader_tiff.c
 tiff_la_LDFLAGS	     = -no-undefined -module -avoid-version
 tiff_la_LIBADD	     = @TIFFLIBS@
+endif
 
-gif_la_SOURCES	     = @GIF_LA@
+if GIF_LOADER
+gif_la_SOURCES	     = loader_gif.c
 gif_la_LDFLAGS	     = -no-undefined -module -avoid-version
 gif_la_LIBADD	     = @GIFLIBS@
+endif
 
 pnm_la_SOURCES	     = loader_pnm.c
 pnm_la_LDFLAGS	     = -no-undefined -module -avoid-version