mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-23 09:10:43 +00:00
149 lines
5.0 KiB
Plaintext
149 lines
5.0 KiB
Plaintext
--- authlib/configure.orig Thu Oct 30 21:36:15 2003
|
|
+++ authlib/configure Thu Oct 30 21:43:26 2003
|
|
@@ -6766,9 +6766,9 @@
|
|
if test "$doauthmysql" = ""
|
|
then
|
|
LIBS="$MYSQL_LIBS $LIBS"
|
|
- echo "$as_me:$LINENO: checking for mysql_connect" >&5
|
|
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
|
|
-if test "${ac_cv_func_mysql_connect+set}" = set; then
|
|
+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
|
|
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
|
|
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
@@ -6779,7 +6779,7 @@
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char mysql_connect (); below.
|
|
+ which can conflict with char mysql_real_connect (); below. */
|
|
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
<limits.h> exists even on freestanding compilers. */
|
|
#ifdef __STDC__
|
|
@@ -6794,14 +6794,14 @@
|
|
#endif
|
|
/* We use char because int might match the return type of a gcc2
|
|
builtin and then its argument prototype would still apply. */
|
|
-char mysql_connect ();
|
|
+char mysql_real_connect ();
|
|
/* The GNU C library defines this for functions which it implements
|
|
to always fail with ENOSYS. Some functions are actually named
|
|
something starting with __ and the normal name is an alias. */
|
|
-#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
|
|
+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
|
|
choke me
|
|
#else
|
|
-char (*f) () = mysql_connect;
|
|
+char (*f) () = mysql_real_connect;
|
|
#endif
|
|
#ifdef __cplusplus
|
|
}
|
|
@@ -6810,7 +6810,7 @@
|
|
int
|
|
main ()
|
|
{
|
|
-return f != mysql_connect;
|
|
+return f != mysql_real_connect;
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -6827,18 +6827,18 @@
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
- ac_cv_func_mysql_connect=yes
|
|
+ ac_cv_func_mysql_real_connect=yes
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-ac_cv_func_mysql_connect=no
|
|
+ac_cv_func_mysql_real_connect=no
|
|
fi
|
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
|
|
-if test $ac_cv_func_mysql_connect = yes; then
|
|
+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
|
|
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
|
|
+if test $ac_cv_func_mysql_real_connect = yes; then
|
|
doauthmysql="yes"
|
|
|
|
fi
|
|
@@ -6930,9 +6930,9 @@
|
|
else
|
|
saveLIBS="$LIBS"
|
|
LIBS="$MYSQL_LIBS $LIBS"
|
|
- echo "$as_me:$LINENO: checking for mysql_connect" >&5
|
|
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
|
|
-if test "${ac_cv_func_mysql_connect+set}" = set; then
|
|
+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
|
|
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
|
|
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
@@ -6943,7 +6943,7 @@
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char mysql_connect (); below.
|
|
+ which can conflict with char mysql_real_connect (); below.
|
|
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
<limits.h> exists even on freestanding compilers. */
|
|
#ifdef __STDC__
|
|
@@ -6958,14 +6958,14 @@
|
|
#endif
|
|
/* We use char because int might match the return type of a gcc2
|
|
builtin and then its argument prototype would still apply. */
|
|
-char mysql_connect ();
|
|
+char mysql_real_connect ();
|
|
/* The GNU C library defines this for functions which it implements
|
|
to always fail with ENOSYS. Some functions are actually named
|
|
something starting with __ and the normal name is an alias. */
|
|
-#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
|
|
+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
|
|
choke me
|
|
#else
|
|
-char (*f) () = mysql_connect;
|
|
+char (*f) () = mysql_real_connect;
|
|
#endif
|
|
#ifdef __cplusplus
|
|
}
|
|
@@ -6974,7 +6974,7 @@
|
|
int
|
|
main ()
|
|
{
|
|
-return f != mysql_connect;
|
|
+return f != mysql_real_connect;
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -6991,18 +6991,18 @@
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
- ac_cv_func_mysql_connect=yes
|
|
+ ac_cv_func_mysql_real_connect=yes
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-ac_cv_func_mysql_connect=no
|
|
+ac_cv_func_mysql_real_connect=no
|
|
fi
|
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
|
|
-if test $ac_cv_func_mysql_connect = yes; then
|
|
+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
|
|
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
|
|
+if test $ac_cv_func_mysql_real_connect = yes; then
|
|
AUTHMYSQL="authmysql${EXEEXT}"
|
|
HAVE_AUTHMYSQL=1
|
|
else
|