Small modification of check expat procedure.

diff --git a/adm/unix/config_files/check_expat.m4 b/adm/unix/config_files/check_expat.m4
index 5e1f5595e602b91190590254c625e3fbb367c442..19241e62d930508f1e3b47f57ea429399ea2a915 100644 (file)
--- a/adm/unix/config_files/check_expat.m4
+++ b/adm/unix/config_files/check_expat.m4
@@ -26,18 +26,27 @@ CPPFLAGS_old=$CPPFLAGS
 
 # Custom location of expat package can be specified
 # through EXPAT_DIR variable
+EXPATDIR=
 if test "x$EXPAT_DIR" != "x"
 then
-  if test "x$EXPAT_DIR" = "x/usr"
+  EXPATDIR=$EXPAT_DIR
+elif test "x$EXPAT_ROOT" != "x"
+then
+  EXPATDIR=$EXPAT_ROOT
+fi
+
+if test "x$EXPATDIR" != "x"
+then
+  if test "x$EXPATDIR" = "x/usr"
   then
     AC_MSG_NOTICE(Trying native Expat...)
     TMPLIBS="-lexpat $LIBS"
   else
-    AC_MSG_NOTICE(Trying Expat from $EXPAT_DIR ...)
-    TMPLIBS="-L$EXPAT_DIR/lib -lexpat $LIBS"
-    CXXFLAGS="$CXXFLAGS -I$EXPAT_DIR/include"
-    CPPFLAGS="$CPPFLAGS -I$EXPAT_DIR/include"
-    EXPAT_INCLUDES="-I$EXPAT_DIR/include"
+    AC_MSG_NOTICE(Trying Expat from $EXPATDIR ...)
+    TMPLIBS="-L$EXPATDIR/lib -lexpat $LIBS"
+    CXXFLAGS="$CXXFLAGS -I$EXPATDIR/include"
+    CPPFLAGS="$CPPFLAGS -I$EXPATDIR/include"
+    EXPAT_INCLUDES="-I$EXPATDIR/include"
   fi
 else
   AC_MSG_NOTICE(Trying native Expat...)