diff --git a/configure.in b/configure.in
index 71d962a..87c8e09 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,10 @@
dnl Process this file with autoconf to create configure.
AC_INIT(src/Imlib2.h)
-AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE(imlib2, 1.0.0)
+
+AM_CONFIG_HEADER(config.h)
AC_ARG_WITH(edb,
[ --with-edb=DIR use edb rooted at
],
@@ -34,8 +36,7 @@ fi
if test x$mmx = xyes; then
AC_DEFINE(DO_MMX_ASM, 1, [enabling MMX Assembly])
fi
-
-AM_INIT_AUTOMAKE(imlib2, 1.0.0)
+AM_CONDITIONAL(HAVE_MMX, test x$mmx = xyes)
pkglibdir='${libdir}'/loaders
AC_SUBST(pkglibdir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c1d0c2..96df1c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,9 @@ INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
$(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
-I. -I$(top_srcdir) -I$(top_srcdir)/src \
-I$(top_srcdir)/loaders
+MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
+ asm_blend_cmod.S
+MMX_OBJS = $(MMX_SRCS:.S=.lo)
lib_LTLIBRARIES = libImlib2.la
include_HEADERS = Imlib2.h
@@ -18,22 +21,27 @@ libImlib2_la_SOURCES = scale.c image.c blend.c file.c rgbadraw.c api.c \
filter.c script.c dynamic_filters.c \
Imlib2.h image.h scale.h blend.h updates.h colormod.h \
file.h common.h rgbadraw.h font.h format.h \
- rotate.h grad.h filter.h script.h dynamic_filters.h \
- asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
- asm_blend_cmod.S
+ rotate.h grad.h filter.h script.h dynamic_filters.h
+
EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c \
context.c color.h context.h draw.h grab.h rend.h \
rgba.h ximage.h
+libImlib2_la_LDFLAGS = -version-info 1:0:0
+if HAVE_MMX
+libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \
+ $(top_builddir)/libltdl/libltdlc.la \
+ $(x_libs) -lttf $(LDFLAGS)
+libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)
+else
libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ \
$(top_builddir)/libltdl/libltdlc.la \
$(x_libs) -lttf $(LDFLAGS)
libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
-libImlib2_la_LDFLAGS = -version-info 1:0:0
+endif
SYS_LOADERS_PATH = @pkglibdir@
image.lo: loaderpath.h
loaderpath.h: Makefile
@echo "#define SYS_LOADERS_PATH \"${SYS_LOADERS_PATH}\"" > $@
@echo "#define USER_LOADERS_PATH \".loaders\"" >> $@
-