commit configure
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1479 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
parent
8996daa7c8
commit
e0050ef3d7
256
configure
vendored
256
configure
vendored
@ -845,9 +845,6 @@ if test -n "$ac_init_help"; then
|
|||||||
Optional Features:
|
Optional Features:
|
||||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||||
--enable-cut-c support for executing c code when a cut occurs
|
|
||||||
--enable-myddas enable the MYDDAS library
|
|
||||||
--enable-myddas-stats enable the MYDDAS library statistics support
|
|
||||||
--enable-tabling support tabling
|
--enable-tabling support tabling
|
||||||
--enable-or-parallelism support or-parallelism as: env-copy,sba,a-cow
|
--enable-or-parallelism support or-parallelism as: env-copy,sba,a-cow
|
||||||
--enable-depth-limit support depth-bound computation
|
--enable-depth-limit support depth-bound computation
|
||||||
@ -2265,174 +2262,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-cut-c was given.
|
|
||||||
if test "${enable_cut_c+set}" = set; then
|
|
||||||
enableval="$enable_cut_c"
|
|
||||||
cut_c="$enableval"
|
|
||||||
else
|
|
||||||
cut_c=no
|
|
||||||
fi;
|
|
||||||
# Check whether --enable-myddas was given
|
|
||||||
# and if so, trys to guess which development libraries
|
|
||||||
# (MySQL or ODBC) to use
|
|
||||||
if test "${enable_myddas+set}" = set; then
|
|
||||||
|
|
||||||
#Tests for MySQL Devel Libraries
|
|
||||||
echo "$as_me:$LINENO: checking for MySQL for MYDDAS" >&5
|
|
||||||
echo $ECHO_N "checking for MySQL for MYDDAS... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_lib_mysql_myddas+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv $LIBS"
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <mysql/mysql.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int main(){
|
|
||||||
MYSQL *conn;
|
|
||||||
conn = mysql_init(NULL);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
||||||
(eval $ac_link) 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } &&
|
|
||||||
{ ac_try='test -z "$ac_c_werror_flag"
|
|
||||||
|| test ! -s conftest.err'
|
|
||||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
||||||
(eval $ac_try) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; } &&
|
|
||||||
{ ac_try='test -s conftest$ac_exeext'
|
|
||||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
||||||
(eval $ac_try) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; }; then
|
|
||||||
ac_cv_lib_mysql_myddas=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_cv_lib_mysql_myddas=no
|
|
||||||
fi
|
|
||||||
rm -f conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: $ac_cv_lib_mysql_myddas" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_lib_mysql_myddas" >&6
|
|
||||||
if test $ac_cv_lib_mysql_myddas = yes; then
|
|
||||||
LIBS="-L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv $LIBS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Tests for ODBC Devel Libraries
|
|
||||||
echo "$as_me:$LINENO: checking for ODBC for MYDDAS" >&5
|
|
||||||
echo $ECHO_N "checking for ODBC for MYDDAS... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_lib_ODBC_myddas+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lodbc $LIBS"
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <sql.h>
|
|
||||||
#include <sqlucode.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int main(){
|
|
||||||
SQLHENV henv;
|
|
||||||
SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &henv);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
||||||
(eval $ac_link) 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } &&
|
|
||||||
{ ac_try='test -z "$ac_c_werror_flag"
|
|
||||||
|| test ! -s conftest.err'
|
|
||||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
||||||
(eval $ac_try) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; } &&
|
|
||||||
{ ac_try='test -s conftest$ac_exeext'
|
|
||||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
||||||
(eval $ac_try) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; }; then
|
|
||||||
ac_cv_lib_odbc_myddas=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_cv_lib_odbc_myddas=no
|
|
||||||
fi
|
|
||||||
rm -f conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_myddas" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_lib_odbc_myddas" >&6
|
|
||||||
if test $ac_cv_lib_odbc_myddas = yes; then
|
|
||||||
LIBS="-lodbc $LIBS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "$ac_cv_lib_mysql_myddas" = "no"
|
|
||||||
then
|
|
||||||
if test "$ac_cv_lib_odbc_myddas" = "no"
|
|
||||||
then
|
|
||||||
echo "-------------------------------"
|
|
||||||
echo "--"
|
|
||||||
echo "--"
|
|
||||||
echo "--"
|
|
||||||
echo "-- There\'s no devel libraries for MySQL or ODBC"
|
|
||||||
echo "--"
|
|
||||||
echo "--"
|
|
||||||
echo "--"
|
|
||||||
echo "-------------------------------"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check whether --enable-myddas-stats was given.
|
|
||||||
if test "${enable_myddas_stats+set}" = set; then
|
|
||||||
enableval="$enable_myddas_stats"
|
|
||||||
myddas_stats="$enableval"
|
|
||||||
else
|
|
||||||
myddas_stats=no
|
|
||||||
fi;
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check whether --enable-tabling or --disable-tabling was given.
|
# Check whether --enable-tabling or --disable-tabling was given.
|
||||||
if test "${enable_tabling+set}" = set; then
|
if test "${enable_tabling+set}" = set; then
|
||||||
enableval="$enable_tabling"
|
enableval="$enable_tabling"
|
||||||
@ -2726,22 +2556,6 @@ _ACEOF
|
|||||||
#define MinTrailSpace ( 48*SIZEOF_INT_P)
|
#define MinTrailSpace ( 48*SIZEOF_INT_P)
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test "$depthlimit" = yes -a "$tabling" = yes
|
|
||||||
then
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "********************************************************"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "!!!!!! WARNING !!!!!!"
|
|
||||||
echo "Depth Limit makes no sense with Tabling"
|
|
||||||
echo "Please contact ricroc@ncc.up.pt for help"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "********************************************************"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define MinHeapSpace (200*SIZEOF_INT_P)
|
#define MinHeapSpace (200*SIZEOF_INT_P)
|
||||||
@ -5880,6 +5694,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
INSTALL_DLLS="#"
|
INSTALL_DLLS="#"
|
||||||
|
EXTRA_OBJS=""
|
||||||
SHLIB_LD="@#"
|
SHLIB_LD="@#"
|
||||||
DO_SECOND_LD="#"
|
DO_SECOND_LD="#"
|
||||||
M4="m4"
|
M4="m4"
|
||||||
@ -6423,71 +6238,15 @@ case "$orparallelism" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test "$ac_cv_lib_mysql_myddas" = "yes"
|
|
||||||
then
|
|
||||||
if test "$cut_c" = "no"
|
|
||||||
then
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "********************************************************"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "!!!!!! WARNING !!!!!!"
|
|
||||||
echo "The MyDDAS interface makes no sense without cut-c"
|
|
||||||
echo "Please contact tiagosoares@ncc.up.pt for help"
|
|
||||||
echo
|
|
||||||
echo "Enabling cut-c"
|
|
||||||
echo
|
|
||||||
echo "********************************************************"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
cut_c="yes"
|
|
||||||
fi
|
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$ac_cv_lib_odbc_myddas" = "yes"
|
|
||||||
then
|
|
||||||
if test "$cut_c" = "no"
|
|
||||||
then
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "********************************************************"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "!!!!!! WARNING !!!!!!"
|
|
||||||
echo "The MyDDAS interface makes no sense without cut-c"
|
|
||||||
echo "Please contact tiagosoares@ncc.up.pt for help"
|
|
||||||
echo
|
|
||||||
echo "Enabling cut-c"
|
|
||||||
echo
|
|
||||||
echo "********************************************************"
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
cut_c="yes"
|
|
||||||
fi
|
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$myddas_stats" = "yes"
|
|
||||||
then
|
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_STATS"
|
|
||||||
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. */
|
||||||
@ -13200,10 +12959,10 @@ 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
|
||||||
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -13211,7 +12970,8 @@ done
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
for ac_func in fesettrapenable finite getcwd getenv
|
|
||||||
|
for ac_func in fesettrapenable fgetpos finite getcwd getenv
|
||||||
do
|
do
|
||||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||||
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||||
|
Reference in New Issue
Block a user