--- Amaya/configure.in	2001/12/20 14:59:25	1.75
+++ Amaya/configure.in	2002/01/07 15:46:57	1.76
@@ -67,49 +67,6 @@ AC_PATH_PROG(SED, sed, /bin/sed, $PATH:/
 AC_PATH_PROG(AR, ar, /usr/bin/ar, $PATH:/bin:/usr/bin:/usr/ucb/bin)
 AC_PATH_PROG(DIFF, diff, /usr/bin/diff, $PATH:/bin:/usr/bin:/usr/ucb/bin)
 
-AC_ARG_WITH(graphic-libs, [  --without-graphic-libs    doesn't use provided libjpeg, libpng.])
-if test "$withval" = "no" ; then
-dnl
-    AC_MSG_CHECKING([for libjpeg version = 6b])
-    AC_EGREP_CPP([x 62 *x],
-        [#include <jpeglib.h>
-         x JPEG_LIB_VERSION x],
-dnl
-        AC_MSG_RESULT([yes])
-        LIBJPEG='-ljpeg'
-        MAKEJPEG=['#'],
-dnl
-        AC_MSG_RESULT([no])
-        LIBJPEG='../libjpeg.a'      dnl LIBJPEG goes into amaya/Makefile.in
-        )
-dnl    
-dnl
-    AC_MSG_CHECKING([for libpng version = 1.0.x])
-    AC_EGREP_CPP([x \"1.0\..*\" *x],
-        [#include <png.h>
-	x PNG_LIBPNG_VER_STRING x],
-dnl
-        AC_MSG_RESULT([yes])
-        LIBPNG='-lpng'
-        LIBZ=''
-	MAKEPNG=['#'],
-dnl
-        AC_MSG_RESULT([no])
-        LIBPNG='../libpng.a'
-        LIBZ='../libz.a'
-        )
-else
-    LIBJPEG='../libjpeg.a'
-    LIBPNG='../libpng.a'
-    LIBZ='../libz.a'
-fi
-dnl
-AC_SUBST(LIBJPEG)
-AC_SUBST(LIBPNG)
-AC_SUBST(LIBZ)
-AC_SUBST(MAKEJPEG)
-AC_SUBST(MAKEPNG)
-
 dnl
 dnl Checks for libraries.
 dnl
@@ -285,6 +242,7 @@ GTK_LIBRARIES="`gtk-config --libs` -lgdk
 AC_SUBST(GTK_LIBRARIES)
 GTK_OPTIONS=-D_GTK
   no_motif=yes
+  no_graphic=yes
 else
 dnl
 dnl Checking for Motif libraries and includes
@@ -465,6 +423,55 @@ dnl    SPECIFIC STUFF : CONFIGURATION OP
 dnl
 dnl  ***************************************************************
 
+AC_ARG_WITH(graphic-libs, [  --without-graphic-libs    doesn't use provided libjpeg, libpng.])
+if test "$withval" = "no" ; then
+  no_graphic = yes
+else
+  no_graphic =
+fi
+
+if test "$no_graphic" = yes; then
+dnl
+    AC_MSG_CHECKING([for libjpeg version = 6b])
+    AC_EGREP_CPP([x 62 *x],
+        [#include <jpeglib.h>
+         x JPEG_LIB_VERSION x],
+dnl
+        AC_MSG_RESULT([yes])
+        LIBJPEG='-ljpeg'
+        MAKEJPEG=['#'],
+dnl
+        AC_MSG_RESULT([no])
+        LIBJPEG='../libjpeg.a'      dnl LIBJPEG goes into amaya/Makefile.in
+        )
+dnl    
+dnl
+    AC_MSG_CHECKING([for libpng version = 1.0.x])
+    AC_EGREP_CPP([x \"1.0\..*\" *x],
+        [#include <png.h>
+	x PNG_LIBPNG_VER_STRING x],
+dnl
+        AC_MSG_RESULT([yes])
+        LIBPNG='-lpng'
+        LIBZ=''
+	MAKEPNG=['#'],
+dnl
+        AC_MSG_RESULT([no])
+        LIBPNG='../libpng.a'
+        LIBZ='../libz.a'
+        )
+else
+    LIBJPEG='../libjpeg.a'
+    LIBPNG='../libpng.a'
+    LIBZ='../libz.a'
+fi
+dnl
+AC_SUBST(LIBJPEG)
+AC_SUBST(LIBPNG)
+AC_SUBST(LIBZ)
+AC_SUBST(MAKEJPEG)
+AC_SUBST(MAKEPNG)
+
 AMAYA_VER="6.0"
 
 dnl
@@ -508,19 +515,22 @@ else
   fi
 fi
 
- 
 dnl
 dnl Check for additionnal packages
 dnl use AC_CONFIG_SUBDIRS to launch configure in the subdir
 dnl
-AC_ARG_ENABLE(svg,           [  --disable-svg           remove SVG support ])
-AC_ARG_ENABLE(annot,         [  --disable-annot         remove Annotations support ])
-AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])
-AC_ARG_ENABLE(annot-threads, [  --disable-annot-threads remove annotation threads ])
-AC_ARG_ENABLE(i18n,          [  --with-18n              enable I18N support (experimental) ])
-AC_ARG_ENABLE(GL,            [  --with-gl               enable Opengl canvas (experimental) ])
-
+AC_ARG_WITH(i18n,            [  --with-18n              enable I18N support (experimental) ])
+dnl
+dnl I18N support disabled by default
+dnl
+if test "$with_i18n" = "yes" ; then
+   I18N_OPTIONS=-D_I18N_
+else
+   with_i18n="no"
+   I18N_OPTIONS=""
+fi
 
+AC_ARG_WITH(GL,              [  --with-gl               enable Opengl canvas (experimental) ])
 dnl
 dnl GL canvas is disabled by default
 dnl
@@ -641,6 +651,12 @@ if test "$with_gl" = "yes" ; then
 AC_SUBST(GL_INCLUDES)
 AC_SUBST(GL_LIBRARIES)
 fi
+
+AC_ARG_ENABLE(svg,           [  --disable-svg           remove SVG support ])
+AC_ARG_ENABLE(annot,         [  --disable-annot         remove Annotations support ])
+AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])
+AC_ARG_ENABLE(annot-threads, [  --disable-annot-threads remove annotation threads ])
+
 dnl
 dnl plugins support is disabled by default
 dnl
@@ -701,19 +717,6 @@ if test "$with_annot_threads" = "" ; the
     fi
 fi
 
-dnl
-dnl I18N support disabled by default
-dnl
-if test "$with_i18n" = "" ; then
-    if test "$enable_i18n" = "yes" ; then
-	with_i18n="yes"
-	I18N_OPTIONS=-D_I18N_
-    else
-	with_i18n="no"
-	I18N_OPTIONS=""
-    fi
-fi
-
 if test "$build_amaya" = "yes" ; then
     if test ! -f $srcdir/../libwww/Makefile.in ; then
 	AC_MSG_WARN(libwww sources not found !!)
@@ -947,8 +950,12 @@ fi
 
 if test "$no_motif" = yes ; then
     echo "Amaya configured with GTK"
+    echo "Amaya configured without static graphic libraries (libjpeg, libpng)"
 else
 if test "$no_motif" = yes ; then
+    echo "Amaya configured without static graphic libraries (libjpeg, libpng)"
+fi
+if test "$no_motif" = yes ; then
     echo "Motif seems not installed on this machine"
     echo "Amaya need Motif 1.2 or 2.0"
 else