config: update configure to reflect yaksa move

Author: hzhou

autogen.sh

@@ -228,8 +228,7 @@ set_externals() {
         fi
 
         if [ "yes" = "$do_yaksa" ] ; then
-            check_submodule_presence "modules/yaksa"
-            externals="${externals} modules/yaksa"
+            externals="${externals} src/mpi/datatype/typerep/yaksa"
         fi
     fi
 }
@@ -594,7 +593,7 @@ autogen_external() {
     if [ -d "$_dir" -o -L "$_dir" ] ; then
         echo "------------------------------------------------------------------------"
         echo "running third-party initialization in $_dir"
-        if test "$_dir" = "modules/yaksa" -a -n "$yaksa_depth" ; then
+        if test "$_dir" = "src/mpi/datatype/typerep/yaksa" -a -n "$yaksa_depth" ; then
             (cd $_dir && ./autogen.sh --pup-max-nesting=$yaksa_depth) || exit 1
         else
             (cd $_dir && ./autogen.sh) || exit 1

src/mpi/datatype/typerep/src/subconfigure.m4

@@ -43,21 +43,21 @@ yaksalib=""
 AC_SUBST([yaksalib])
 
 AM_COND_IF([BUILD_YAKSA_ENGINE], [
-m4_define([yaksa_embedded_dir],[modules/yaksa])
+m4_define([yaksa_embedded_dir],[src/mpi/datatype/typerep/yaksa])
 PAC_CHECK_HEADER_LIB_EXPLICIT([yaksa],[yaksa.h],[$YAKSALIBNAME],[yaksa_init])
 if test "$with_yaksa" = "embedded" ; then
-    yaksalib="modules/yaksa/lib${YAKSALIBNAME}.la"
-    if test ! -e "${use_top_srcdir}/modules/PREBUILT"; then
+    yaksalib="yaksa_embedded_dir/lib${YAKSALIBNAME}.la"
+    if test ! -e "${use_top_srcdir}/modules/PREBUILT-yaksa"; then
         PAC_PUSH_ALL_FLAGS()
         PAC_RESET_ALL_FLAGS()
         # no need for libtool versioning when embedding YAKSA
         yaksa_subdir_args="--enable-embedded"
-        PAC_CONFIG_SUBDIR_ARGS([modules/yaksa],[$yaksa_subdir_args],[],[AC_MSG_ERROR(YAKSA configure failed)])
+        PAC_CONFIG_SUBDIR_ARGS(yaksa_embedded_dir,[$yaksa_subdir_args],[],[AC_MSG_ERROR(YAKSA configure failed)])
         PAC_POP_ALL_FLAGS()
-        yaksasrcdir="modules/yaksa"
+        yaksasrcdir="yaksa_embedded_dir"
     fi
-    PAC_APPEND_FLAG([-I${main_top_builddir}/modules/yaksa/src/frontend/include], [CPPFLAGS])
-    PAC_APPEND_FLAG([-I${use_top_srcdir}/modules/yaksa/src/frontend/include], [CPPFLAGS])
+    PAC_APPEND_FLAG(-I${main_top_builddir}/yaksa_embedded_dir/src/frontend/include, [CPPFLAGS])
+    PAC_APPEND_FLAG(-I${use_top_srcdir}/yaksa_embedded_dir/src/frontend/include, [CPPFLAGS])
 fi
 ])