[prev in list] [next in list] [prev in thread] [next in thread]
List: proftpd-committers
Subject: [ProFTPD-committers] proftpd configure,1.371,1.372
From: TJ Saunders <castaglia () users ! sourceforge ! net>
Date: 2013-03-29 17:25:55
Message-ID: E1ULd3s-0002Rk-47 () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/proftp/proftpd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3355
Modified Files:
configure
Log Message:
Updated configure.
Index: configure
===================================================================
RCS file: /cvsroot/proftp/proftpd/configure,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -d -r1.371 -r1.372
--- configure 7 Mar 2013 17:19:31 -0000 1.371
+++ configure 29 Mar 2013 17:25:52 -0000 1.372
@@ -37232,19 +37232,87 @@
echo "${ECHO_T}no" >&6; }
if test x"$pr_use_mysql" = xyes; then
- # Check for other MySQL-specific functionality here
+ saved_cppflags="$CPPFLAGS"
saved_ldflags="$LDFLAGS"
saved_libs="$LIBS"
- saved_cppflags="$CPPFLAGS"
- # Fiddle with CPPFLAGS, LDFLAGS
- CPPFLAGS="$CPPFLAGS $ac_build_addl_includes"
+ CPPFLAGS="$CPPFLAGS $ac_build_addl_includes"
LDFLAGS="$LDFLAGS $ac_build_addl_libdirs"
LIBS=`echo "$LIBS" | sed -e 's/-lsupp//g'`;
LIBS="$LIBS -lm -lmysqlclient -lz"
- # For Bug#3669, we need to check for make_scrambled_password_323.
+
+ { echo "$as_me:$LINENO: checking for MySQL's make_scrambled_password" >&5
+echo $ECHO_N "checking for MySQL's make_scrambled_password... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #include <mysql.h>
+
+int
+main ()
+{
+
+ char output[32];
+ char *input = NULL;
+ (void) make_scrambled_password(output, input);
+
+ ;
+ 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
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MYSQL_MAKE_SCRAMBLED_PASSWORD 1
+_ACEOF
+
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
{ echo "$as_me:$LINENO: checking for MySQL's make_scrambled_password_323" >&5
echo $ECHO_N "checking for MySQL's make_scrambled_password_323... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
@@ -37341,7 +37409,7 @@
char output[32];
char *input = NULL;
size_t inputlen = 0;
- my_make_scrambled_password(output, input, inputlen);
+ (void) my_make_scrambled_password(output, input, inputlen);
;
return 0;
@@ -37388,8 +37456,78 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- # restore CPPFLAGS, LDFLAGS
- CPPFLAGS="$saved_cppflags"
+ { echo "$as_me:$LINENO: checking for MySQL's my_make_scrambled_password_323" >&5
+echo $ECHO_N "checking for MySQL's my_make_scrambled_password_323... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #include <mysql.h>
+
+int
+main ()
+{
+
+ char output[32];
+ char *input = NULL;
+ size_t inputlen = 0;
+ (void) my_make_scrambled_password_323(output, input, inputlen);
+
+ ;
+ 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
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MYSQL_MY_MAKE_SCRAMBLED_PASSWORD_323 1
+_ACEOF
+
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ CPPFLAGS="$saved_cppflags"
LDFLAGS="$saved_ldflags"
LIBS="$saved_libs"
fi
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic