configure: Added a check for the soname of libodbc.

This commit is contained in:
Alexandre Julliard 2008-01-07 17:16:29 +01:00
parent a41f0f1b45
commit 84f8ab6b83
5 changed files with 98 additions and 19 deletions

82
configure vendored
View File

@ -15672,6 +15672,88 @@ esac
fi fi
{ echo "$as_me:$LINENO: checking for -lodbc" >&5
echo $ECHO_N "checking for -lodbc... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_odbc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_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. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SQLConnect ();
int
main ()
{
return SQLConnect ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_odbc=`otool -L conftest$ac_exeext | grep "libodbc\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libodbc\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_odbc=`$ac_cv_path_LDD conftest$ac_exeext | grep "libodbc\\.$LIBEXT" | sed -e "s/^.*\(libodbc\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_odbc" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBODBC "libodbc.$LIBEXT"
_ACEOF
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_odbc" >&5
echo "${ECHO_T}$ac_cv_lib_soname_odbc" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBODBC "$ac_cv_lib_soname_odbc"
_ACEOF
fi
if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
"$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \
"$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \

View File

@ -1167,6 +1167,9 @@ fi
WINE_NOTICE_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], WINE_NOTICE_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
[libpng development files not found, PNG won't be supported.]) [libpng development files not found, PNG won't be supported.])
dnl **** Check for libodbc ****
WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
dnl **** Check for any sound system **** dnl **** Check for any sound system ****
if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
"$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \

View File

@ -518,31 +518,23 @@ static BOOL ODBC_LoadDriverManager(void)
TRACE("\n"); TRACE("\n");
gProxyHandle.bFunctionReady = FALSE; gProxyHandle.bFunctionReady = FALSE;
gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND;
if (s!= NULL && strlen (s) >= sizeof(gProxyHandle.dmLibName)) #ifdef SONAME_LIBODBC
{ if (!s || !s[0]) s = SONAME_LIBODBC;
ERR("Driver name too long (%s)\n",s); #endif
return FALSE; if (!s || !s[0]) goto failed;
}
if (s == NULL || strlen(s) == 0)
s = "libodbc.so";
strcpy(gProxyHandle.dmLibName, s);
gProxyHandle.dmHandle = wine_dlopen(gProxyHandle.dmLibName, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); gProxyHandle.dmHandle = wine_dlopen(s, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error));
if (gProxyHandle.dmHandle == NULL) /* fail to load unixODBC driver manager */ if (gProxyHandle.dmHandle != NULL)
{
WARN("failed to open library %s: %s\n", gProxyHandle.dmLibName, error);
gProxyHandle.dmLibName[0] = '\0';
gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND;
return FALSE;
}
else
{ {
gProxyHandle.nErrorType = ERROR_FREE; gProxyHandle.nErrorType = ERROR_FREE;
return TRUE; return TRUE;
} }
failed:
WARN("failed to open library %s: %s\n", debugstr_a(s), error);
gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND;
return FALSE;
} }

View File

@ -45,7 +45,6 @@ typedef struct proxyhandle
int nErrorType; int nErrorType;
DM_FUNC functions[NUM_SQLFUNC]; /* entry point for driver manager functions */ DM_FUNC functions[NUM_SQLFUNC]; /* entry point for driver manager functions */
char driverLibName[200]; /* ODBC driver SO name */ char driverLibName[200]; /* ODBC driver SO name */
char dmLibName[200]; /* driver manager library name */
char ServerName[200]; /* keep server name */ char ServerName[200]; /* keep server name */
char UserName[50]; /* keep username */ char UserName[50]; /* keep username */
} PROXYHANDLE; } PROXYHANDLE;

View File

@ -1023,6 +1023,9 @@
/* Define to the soname of the libncurses library. */ /* Define to the soname of the libncurses library. */
#undef SONAME_LIBNCURSES #undef SONAME_LIBNCURSES
/* Define to the soname of the libodbc library. */
#undef SONAME_LIBODBC
/* Define to the soname of the libpng library. */ /* Define to the soname of the libpng library. */
#undef SONAME_LIBPNG #undef SONAME_LIBPNG