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

fix MYDDAS compilation

Browse Source
This commit is contained in:
Vítor Santos Costa
2014-07-10 09:07:24 -05:00
parent 04092424bf
commit 6c7a84a942
3 changed files with 96 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/myddas/Makefile.in
View File

@@ -79,7 +79,7 @@ all: $(SOBJS)
$(CC) -c $(CFLAGS) $< -o $@
@DO_SECOND_LD@%.@SO@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@
install: all install_myddas install-examples
mkdir -p $(DESTDIR)$(SHAREDIR)

16
packages/myddas/configure.in
View File

@@ -36,7 +36,8 @@ if test "$yap_cv_myddas" != "no"
then
PKG_MYDDAS="packages/myddas"
dnl check for mysql
AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes"], [yap_cv_mysql="no"])
OLD_LIBS="$LIBS"
AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes" MYDDAS_LIBS="-lmysqlclient $MYDDAS_LIBS"], [yap_cv_mysql="no"])
AC_CHECK_HEADERS(mysql/mysql.h, [], [yap_cv_mysql="no"])
if test "$yap_cv_mysql" = yes
then
@@ -47,6 +48,7 @@ then
case "$target_os" in
*darwin*)
LIBS="$LIBS -framework CoreFoundation"
MYDDAS_LIBS="$MYDDAS_LIBS -framework CoreFoundation"
;;
**)
;;
@@ -54,12 +56,18 @@ then
AC_SEARCH_LIBS(SQLAllocHandle, [odbc], [yap_cv_odbc="yes"], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = yes
then
ODBC_LIBS="$ODBC_LIBS -lodbc"
MYDDAS_LIBS="$MYDDAS_LIBS -lodbc"
else
AC_SEARCH_LIBS(SQLAllocHandle, [iodbc], [yap_cv_odbc="yes"], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = yes
then
ODBC_LIBS="$ODBC_LIBS -liodbc"
MYDDAS_LIBS="$MYDDAS_LIBS -liodbc"
else
AC_SEARCH_LIBS(SQLAllocHandle, [odbc32], [yap_cv_odbc="yes" ], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = yes
then
MYDDAS_LIBS="$MYDDAS_LIBS -lodbc32"
fi
fi
fi
#from SWI ODBC library.
@@ -79,10 +87,12 @@ then
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL"
fi
LIBS="$OLD_LIBS"
else
ENABLE_MYDDAS=""
fi
AC_SUBST(PKG_MYDDAS)
AC_SUBST(MYDDAS_LIBS)