--- Makefile.in.old 2004-06-27 01:21:10.583786240 +0100 +++ Makefile.in 2004-06-27 01:21:18.411596232 +0100 @@ -80,9 +80,6 @@ MAJOR_VERSION = @MAJOR_VERSION@ MAKEINFO = @MAKEINFO@ MINOR_VERSION = @MINOR_VERSION@ -MYSQL_CFLAGS = @MYSQL_CFLAGS@ -MYSQL_CONFIG = @MYSQL_CONFIG@ -MYSQL_LIBS = @MYSQL_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --- configure.ac.old 2004-06-27 01:21:58.754463184 +0100 +++ configure.ac 2004-06-27 01:22:11.841473656 +0100 @@ -78,7 +78,6 @@ AC_CHECK_LIB(gen, strfind) AC_CHECK_LIB(gen, strfind, [ AC_DEFINE(HAVE_STRFIND, 1, [Have strfind]) ] ) AC_CHECK_LIB(cygipc, shmget) -AC_CHECK_MYSQL dnl Checks for header files. AC_HEADER_DIRENT --- configure.old 2004-06-27 01:22:44.346532136 +0100 +++ configure 2004-06-27 01:23:23.874522968 +0100 @@ -329,7 +329,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAJOR_VERSION MINOR_VERSION CLIENT_BIN_FILENAME TOP_BUILD_DIR TOP_SOURCE_DIR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB LN_S PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS GRXLIBS MYSQL_CONFIG MYSQL_LIBS MYSQL_CFLAGS EGREP CXXCPP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAJOR_VERSION MINOR_VERSION CLIENT_BIN_FILENAME TOP_BUILD_DIR TOP_SOURCE_DIR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB LN_S PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS GRXLIBS EGREP CXXCPP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -798,10 +798,6 @@ ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP -ac_env_MYSQL_CONFIG_set=${MYSQL_CONFIG+set} -ac_env_MYSQL_CONFIG_value=$MYSQL_CONFIG -ac_cv_env_MYSQL_CONFIG_set=${MYSQL_CONFIG+set} -ac_cv_env_MYSQL_CONFIG_value=$MYSQL_CONFIG ac_env_CXXCPP_set=${CXXCPP+set} ac_env_CXXCPP_value=$CXXCPP ac_cv_env_CXXCPP_set=${CXXCPP+set} @@ -903,8 +899,6 @@ CXX C++ compiler command CXXFLAGS C++ compiler flags CPP C preprocessor - MYSQL_CONFIG - mysql_config program CXXCPP C++ preprocessor Use these variables to override the choices made by `configure' or to help @@ -5258,74 +5252,6 @@ -if test -z "$MYSQL_CONFIG"; then -# Extract the first word of "mysql_config", so it can be a program name with args. -set dummy mysql_config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MYSQL_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MYSQL_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/mysql/bin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MYSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -MYSQL_CONFIG=$ac_cv_path_MYSQL_CONFIG - -if test -n "$MYSQL_CONFIG"; then - echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5 -echo "${ECHO_T}$MYSQL_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$MYSQL_CONFIG" -then - { { echo "$as_me:$LINENO: error: mysql_config executable not found" >&5 -echo "$as_me: error: mysql_config executable not found" >&2;} - { (exit 1); exit 1; }; } -else - echo "$as_me:$LINENO: checking mysql libraries" >&5 -echo $ECHO_N "checking mysql libraries... $ECHO_C" >&6 - MYSQL_LIBS=`${MYSQL_CONFIG} --libs` - echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5 -echo "${ECHO_T}$MYSQL_LIBS" >&6 - echo "$as_me:$LINENO: checking mysql includes" >&5 -echo $ECHO_N "checking mysql includes... $ECHO_C" >&6 - MYSQL_CFLAGS=`${MYSQL_CONFIG} --cflags` - echo "$as_me:$LINENO: result: $MYSQL_CFLAGS" >&5 -echo "${ECHO_T}$MYSQL_CFLAGS" >&6 -fi - - - - - - - - - ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` @@ -8560,9 +8486,6 @@ s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t s,@GRXLIBS@,$GRXLIBS,;t t -s,@MYSQL_CONFIG@,$MYSQL_CONFIG,;t t -s,@MYSQL_LIBS@,$MYSQL_LIBS,;t t -s,@MYSQL_CFLAGS@,$MYSQL_CFLAGS,;t t s,@EGREP@,$EGREP,;t t s,@CXXCPP@,$CXXCPP,;t t s,@LIBOBJS@,$LIBOBJS,;t t --- aclocal.m4.old 2004-06-27 01:24:31.280275736 +0100 +++ aclocal.m4 2004-06-27 01:25:59.433874352 +0100 @@ -1044,26 +1044,6 @@ dnl $Id: aclocal.m4,v 1.120 2004/06/23 00:36:57 boincadm Exp $ -AC_DEFUN([AC_CHECK_MYSQL],[ -AC_ARG_VAR([MYSQL_CONFIG], [mysql_config program]) -if test -z "$MYSQL_CONFIG"; then -AC_PATH_PROG(MYSQL_CONFIG,mysql_config,,[$PATH:/usr/local/mysql/bin]) -fi -if test -z "$MYSQL_CONFIG" -then - AC_MSG_ERROR([mysql_config executable not found]) -else - AC_MSG_CHECKING(mysql libraries) - MYSQL_LIBS=`${MYSQL_CONFIG} --libs` - AC_MSG_RESULT($MYSQL_LIBS) - AC_MSG_CHECKING(mysql includes) - MYSQL_CFLAGS=`${MYSQL_CONFIG} --cflags` - AC_MSG_RESULT($MYSQL_CFLAGS) -fi -AC_SUBST(MYSQL_LIBS) -AC_SUBST(MYSQL_CFLAGS) -]) - # The contents of this file are subject to the BOINC Public License # Version 1.0 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at --- Makefile.incl.old 2004-06-27 01:26:27.784564392 +0100 +++ Makefile.incl 2004-06-27 01:26:38.555926896 +0100 @@ -1,11 +1,6 @@ ## -*-Makefile -*- ## $Id: Makefile.incl,v 1.12 2004/06/12 04:45:14 davea Exp $ -# Note: MYSQL_CFLAGS and MYSQL_LIBS set by configure from mysql_config - -MYSQL_LIBS = @MYSQL_LIBS@ -MYSQL_CFLAGS = @MYSQL_CFLAGS@ - RSA_LIBS = \ -L$(top_builddir)/RSAEuro/source \ -lrsaeuro @@ -21,7 +16,6 @@ -I$(top_srcdir)/client \ -I$(top_srcdir)/tools \ -I$(top_srcdir)/sched \ - $(MYSQL_CFLAGS) \ -include $(top_builddir)/config.h # this is useful as a dependency to make sure librsaeuro gets compiled before --- client/Makefile.in.old 2004-06-27 01:27:18.087917120 +0100 +++ client/Makefile.in 2004-06-27 01:27:31.150931240 +0100 @@ -14,8 +14,6 @@ @SET_MAKE@ -# Note: MYSQL_CFLAGS and MYSQL_LIBS set by configure from mysql_config - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -82,10 +80,7 @@ MAJOR_VERSION = @MAJOR_VERSION@ MAKEINFO = @MAKEINFO@ MINOR_VERSION = @MINOR_VERSION@ -MYSQL_CFLAGS = @MYSQL_CFLAGS@ -MYSQL_CONFIG = @MYSQL_CONFIG@ -MYSQL_LIBS = @MYSQL_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -162,7 +157,6 @@ -I$(top_srcdir)/client \ -I$(top_srcdir)/tools \ -I$(top_srcdir)/sched \ - $(MYSQL_CFLAGS) \ -include $(top_builddir)/config.h --- client/test_fx_out1.old 2004-06-27 01:28:12.587631904 +0100 +++ client/test_fx_out1 2004-06-27 01:28:28.017286240 +0100 @@ -19,7 +19,6 @@
  • Expat
  • Xerces
  • XSLT -
  • MySQL
  • HTTP explained Other pages: