altered the MyDDAS tests to automatically enable cut-c, if necessary
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1470 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
parent
681717eecb
commit
a170002981
26
configure
vendored
26
configure
vendored
@ -2414,7 +2414,7 @@ _ACEOF
|
|||||||
echo "--"
|
echo "--"
|
||||||
echo "--"
|
echo "--"
|
||||||
echo "--"
|
echo "--"
|
||||||
echo "-- Theres no Devel Libraries for MySQL or ODBC"
|
echo "-- There\'s no devel libraries for MySQL or ODBC"
|
||||||
echo "--"
|
echo "--"
|
||||||
echo "--"
|
echo "--"
|
||||||
echo "--"
|
echo "--"
|
||||||
@ -6423,11 +6423,6 @@ case "$orparallelism" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test "$cut_c" = "yes"
|
|
||||||
then
|
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DCUT_C=1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$ac_cv_lib_mysql_myddas" = "yes"
|
if test "$ac_cv_lib_mysql_myddas" = "yes"
|
||||||
then
|
then
|
||||||
if test "$cut_c" = "no"
|
if test "$cut_c" = "no"
|
||||||
@ -6441,11 +6436,12 @@ if test "$ac_cv_lib_mysql_myddas" = "yes"
|
|||||||
echo "The MyDDAS interface makes no sense without cut-c"
|
echo "The MyDDAS interface makes no sense without cut-c"
|
||||||
echo "Please contact tiagosoares@ncc.up.pt for help"
|
echo "Please contact tiagosoares@ncc.up.pt for help"
|
||||||
echo
|
echo
|
||||||
|
echo "Enabling cut-c"
|
||||||
echo
|
echo
|
||||||
echo "********************************************************"
|
echo "********************************************************"
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
exit
|
cut_c="yes"
|
||||||
fi
|
fi
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
|
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
|
||||||
fi
|
fi
|
||||||
@ -6463,11 +6459,12 @@ if test "$ac_cv_lib_odbc_myddas" = "yes"
|
|||||||
echo "The MyDDAS interface makes no sense without cut-c"
|
echo "The MyDDAS interface makes no sense without cut-c"
|
||||||
echo "Please contact tiagosoares@ncc.up.pt for help"
|
echo "Please contact tiagosoares@ncc.up.pt for help"
|
||||||
echo
|
echo
|
||||||
|
echo "Enabling cut-c"
|
||||||
echo
|
echo
|
||||||
echo "********************************************************"
|
echo "********************************************************"
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
exit
|
cut_c="yes"
|
||||||
fi
|
fi
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
|
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
|
||||||
fi
|
fi
|
||||||
@ -6477,15 +6474,20 @@ if test "$myddas_stats" = "yes"
|
|||||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_STATS"
|
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_STATS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$cut_c" = "yes"
|
||||||
|
then
|
||||||
|
YAP_EXTRAS="$YAP_EXTRAS -DCUT_C=1"
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$tabling" = "yes"
|
if test "$tabling" = "yes"
|
||||||
then
|
then
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
|
YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
||||||
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
||||||
if test "${ac_cv_header_stdc+set}" = set; then
|
if test "${ac_cv_header_stdc+set}" = set; then
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
@ -13198,7 +13200,7 @@ fi
|
|||||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||||
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user