diff --git a/config/ChangeLog b/config/ChangeLog
index 93a62aa773..ddb48af614 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,21 +1,28 @@
+2002-10-15  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* xforms.m4 (lyx_use_xforms_image_loader): move the AM_CONDITIONAL
+	USE_BASIC_IMAGE_LOADER from here...
+	* configure.ac: ... here
+	* configure.in: ...to here, and ...
+
 2002-09-13  John Levon  <levon@movementarian.org>
 
 	* qt.m4: tweak sed usage
- 
+
 2002-09-12  John Levon  <levon@movementarian.org>
 
 	* Makefile.am: qt.m4 not qt2.m4
- 
+
 2002-09-12  John Levon  <levon@movementarian.org>
 
 	* configure.ac:
 	* configure.in:
 	* qt.m4: output Qt version
- 
+
 2002-09-12  John Levon  <levon@movementarian.org>
 
 	* qt.m4: make $FATAL actually work
- 
+
 2002-09-12  John Levon  <levon@movementarian.org>
 
 	* configure.ac:
@@ -23,10 +30,10 @@
 	* lyxinclude.m4:
 	* qt2.m4:
 	* qt.m4: new Qt configure script
- 
+
 2002-09-10  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
-	* relyx_configure.ac: 
+	* relyx_configure.ac:
 	* configure.ac: only require autoconf 2.52
 
 	* Makefile.am (EXTRA_DIST): distribute also xforms.m4
@@ -34,7 +41,7 @@
 2002-08-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* lyxinclude.m4 (LYX_PATH_XPM): do not pass XPM_LIB as 5th
-	argument of AC_CHECK_LIB 
+	argument of AC_CHECK_LIB
 
 	* xforms.m4 (LYX_PATH_XFORMS): use 5th argument of AC_CHECK_LIB to
 	make sure that -lXpm is used when linking. Require LYX_PATH_XPM.
@@ -44,7 +51,7 @@
 
 	* configure.in:
 	* configure.ac: no xforms check with Qt
- 
+
 2002-08-13  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* configure.in: change AC_LANG(XX) back to the AC_LANG_XX variant.
diff --git a/config/configure.ac b/config/configure.ac
index 6494a38712..e198cd9edd 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -150,7 +150,6 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 ## Check whether X is new enough to handle the input method stuff
 AC_CHECK_FUNCS(XOpenIM)
 
- 
 ### check which frontend we want to use
 
 #LYX_USE_FRONTEND
@@ -202,6 +201,9 @@ case "$lyx_use_frontend" in
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
+AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
+	       test $lyx_use_xforms_image_loader = no)
+
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = no ; then
 LYX_ERROR(dnl
diff --git a/config/configure.in b/config/configure.in
index 0d5c238963..b8b614afa8 100644
--- a/config/configure.in
+++ b/config/configure.in
@@ -203,6 +203,10 @@ case "$lyx_use_frontend" in
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
+AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
+	       test $lyx_use_xforms_image_loader = no)
+
+
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = no ; then
 LYX_ERROR(dnl
diff --git a/config/xforms.m4 b/config/xforms.m4
index bbfc6c7d0c..6b9b71c921 100644
--- a/config/xforms.m4
+++ b/config/xforms.m4
@@ -92,7 +92,8 @@ fi
 
 ### If the gui cannot load images itself, then we default to the
 ### very simple one in graphics/GraphicsImageXPM.[Ch]
-AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
-	       test $lyx_use_xforms_image_loader = no)
+#AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
+#	       test $lyx_use_xforms_image_loader = no)
+
 AC_LANG_RESTORE
 LIBS=$save_LIBS])