psckage compilation stuff.

configure

@@ -651,7 +651,7 @@ LTLIBOBJS
 LIBOBJS
 RAPTOR_CPPFLAGS
 RAPTOR_LDFLAGS
-ENABLE_RAPTOR
+PKG_RAPTOR
 LTX_PL
 _ACJNI_JAVAC
 JAVADOC
@@ -13426,9 +13426,9 @@ fi
 
 if test "$yap_cv_raptor" = no
 then
-  ENABLE_RAPTOR="@# "
+  PKG_RAPTOR=""
 else
-  ENABLE_RAPTOR=""
+  PKG_RAPTOR="packages/raptor"
 fi
 
 if test "$yap_cv_raptor" != no; then
@@ -13536,7 +13536,7 @@ RAPTOR_LDFLAGS="$LIBS"
 
 if test "$raptor_available" = no
 then
-  ENABLE_RAPTOR="@# "
+  PKG_RAPTOR=""
   cat << EOF
 ##################################################################
 # ERROR: Could not find raptor library. Either I don't have the
@@ -13544,7 +13544,7 @@ then
 ##################################################################
 EOF
 else
-  ENABLE_RAPTOR=""
+  PKG_RAPTOR="packages/raptor"
 fi
 
 

packages/cplint/configure.in

@@ -28,7 +28,6 @@ if test ! "$yap_cv_cplint" = "no"
 		SHLIB_SUFFIX="so"
 	fi
 	PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs"
-	AC_SUBST(PKG_CPLINT)
 	AC_SUBST(CPLINT_LIBS)
 	AC_SUBST(CPLINT_CFLAGS)
 	AC_SUBST(CPLINT_LDFLAGS)
@@ -38,6 +37,8 @@ else
 	PKG_CPLINT=""
 fi
 
+AC_SUBST(PKG_CPLINT)
+
 mkdir -p  packages/cplint
 mkdir -p  packages/cplint/approx
 mkdir -p  packages/cplint/approx/simplecuddLPADs

packages/raptor

@@ -1 +1 @@
-Subproject commit 0f77a1e1b90b36bddb1844712380f4f3858123b7
+Subproject commit 2436b3e2d13d3ca20e8b3ad4db0825b413dc0ed2