diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MYDDAS: Added option to enable different compilation directories for mysql devel libraries

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1892 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
tiagosoares 2007-06-04 00:56:47 +00:00
parent 211e5cec2b
commit b1d0de4266
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -865,9 +865,9 @@ Optional Features:
--enable-condor allow Yap to be used from condor --enable-condor allow Yap to be used from condor
--enable-april compile Yap to support April ILP system --enable-april compile Yap to support April ILP system
--enable-dlcompat use dlcompat library for dynamic loading on Mac OS X --enable-dlcompat use dlcompat library for dynamic loading on Mac OS X
--enable-myddas enable the MYDDAS library --enable-myddas[=DIR] enable the MYDDAS library
--enable-myddas-stats enable the MYDDAS library statistics support --enable-myddas-stats enable the MYDDAS library statistics support
--enable-myddas-top-level enable the MYDDAS top-level support to MySQL --enable-myddas-top-level enable the MYDDAS top-level support to MySQL
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -2434,13 +2434,13 @@ fi;
if test "${enable_myddas+set}" = set; then if test "${enable_myddas+set}" = set; then
enableval="$enable_myddas" enableval="$enable_myddas"
if test "$enableval" = yes; then if test "$enableval" = yes; then
yap_cv_myddas=yes yap_cv_myddas=/usr/
elif test "$enableval" = no; then elif test "$enableval" = no; then
yap_cv_myddas=no yap_cv_myddas=no
else else
yap_cv_myddas=$enable_myddas yap_cv_myddas=$enable_myddas
LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib" LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib "
CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include "
fi fi
else else
yap_cv_myddas=no yap_cv_myddas=no
@ -4359,8 +4359,8 @@ fi
echo "${ECHO_T}$yap_mysql" >&6 echo "${ECHO_T}$yap_mysql" >&6
if test "$yap_mysql" = yes if test "$yap_mysql" = yes
then then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL" YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
LIBS="$LIBS -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv " LIBS="$LIBS -L${yap_cv_myddas}/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv "
fi fi
echo "$as_me:$LINENO: checking for main in -lodbc" >&5 echo "$as_me:$LINENO: checking for main in -lodbc" >&5

16
configure.in
View File

@ -92,20 +92,20 @@ AC_ARG_WITH(gmp,
[yap_cv_gmp=yes]) [yap_cv_gmp=yes])
AC_ARG_ENABLE(myddas, AC_ARG_ENABLE(myddas,
[ --enable-myddas enable the MYDDAS library], [ --enable-myddas[[=DIR]] enable the MYDDAS library],
if test "$enableval" = yes; then if test "$enableval" = yes; then
yap_cv_myddas=yes yap_cv_myddas=/usr/
elif test "$enableval" = no; then elif test "$enableval" = no; then
yap_cv_myddas=no yap_cv_myddas=no
else else
yap_cv_myddas=$enable_myddas yap_cv_myddas=$enable_myddas
LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib" LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib "
CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include "
fi, fi,
[yap_cv_myddas=no]) [yap_cv_myddas=no])
AC_ARG_ENABLE(myddas-stats, AC_ARG_ENABLE(myddas-stats,
[ --enable-myddas-stats enable the MYDDAS library statistics support], [ --enable-myddas-stats enable the MYDDAS library statistics support],
if test "$yap_cv_myddas" = no; then if test "$yap_cv_myddas" = no; then
myddasstats=no myddasstats=no
else else
@ -113,7 +113,7 @@ AC_ARG_ENABLE(myddas-stats,
fi, myddasstats=no) fi, myddasstats=no)
AC_ARG_ENABLE(myddas-top-level, AC_ARG_ENABLE(myddas-top-level,
[ --enable-myddas-top-level enable the MYDDAS top-level support to MySQL], [ --enable-myddas-top-level enable the MYDDAS top-level support to MySQL],
if test "$yap_cv_myddas" = no; then if test "$yap_cv_myddas" = no; then
myddastoplevel=no myddastoplevel=no
else else
@ -480,8 +480,8 @@ then
AC_MSG_RESULT($yap_mysql) AC_MSG_RESULT($yap_mysql)
if test "$yap_mysql" = yes if test "$yap_mysql" = yes
then then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL" YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
LIBS="$LIBS -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv " LIBS="$LIBS -L${yap_cv_myddas}/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv "
fi fi
dnl check for odbc dnl check for odbc