Attachment #34247 for bug #54962

Lines 80-88 Link Here

(-)Makefile.in.old (-3 lines)
80	MAJOR_VERSION = @MAJOR_VERSION@	80	MAJOR_VERSION = @MAJOR_VERSION@
81	MAKEINFO = @MAKEINFO@	81	MAKEINFO = @MAKEINFO@
82	MINOR_VERSION = @MINOR_VERSION@	82	MINOR_VERSION = @MINOR_VERSION@
83	MYSQL_CFLAGS = @MYSQL_CFLAGS@
84	MYSQL_CONFIG = @MYSQL_CONFIG@
85	MYSQL_LIBS = @MYSQL_LIBS@
86	OBJEXT = @OBJEXT@	83	OBJEXT = @OBJEXT@
87	PACKAGE = @PACKAGE@	84	PACKAGE = @PACKAGE@
88	PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@	85	PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

Lines 78-84 Link Here

(-)configure.ac.old (-1 lines)
78	AC_CHECK_LIB(gen, strfind)	78	AC_CHECK_LIB(gen, strfind)
79	AC_CHECK_LIB(gen, strfind, [ AC_DEFINE(HAVE_STRFIND, 1, [Have strfind]) ] )	79	AC_CHECK_LIB(gen, strfind, [ AC_DEFINE(HAVE_STRFIND, 1, [Have strfind]) ] )
80	AC_CHECK_LIB(cygipc, shmget)	80	AC_CHECK_LIB(cygipc, shmget)
81	AC_CHECK_MYSQL
82		81
83	dnl Checks for header files.	82	dnl Checks for header files.
84	AC_HEADER_DIRENT	83	AC_HEADER_DIRENT




# include <unistd.h>
#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 EGREP CXXCPP LIBOBJS LTLIBOBJS'
ac_subst_files=''

# Initialize some variables set by options.

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}

  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




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`

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





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 -*-
## $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

        -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





@SET_MAKE@

# Note: MYSQL_CFLAGS and MYSQL_LIBS set by configure from mysql_config

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@

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@

        -I$(top_srcdir)/client			\
        -I$(top_srcdir)/tools			\
        -I$(top_srcdir)/sched			\
        $(MYSQL_CFLAGS)				\
        -include $(top_builddir)/config.h



Lines 19-25 Link Here

(-)client/test_fx_out1.old (-1 lines)
19	<li><a href=file:/home/david/software/expat-1.95.2/doc/reference.html>Expat</a>	19	<li><a href=file:/home/david/software/expat-1.95.2/doc/reference.html>Expat</a>
20	<li><a href=file:/home/david/software/xerces-c1_5_1-linux/doc/html/index.html>Xerces</a>	20	<li><a href=file:/home/david/software/xerces-c1_5_1-linux/doc/html/index.html>Xerces</a>
21	<li><a href=file:/home/david/xslt.html>XSLT</a>	21	<li><a href=file:/home/david/xslt.html>XSLT</a>
22	<li><a href=file:/home/david/mysql/manual_toc.html>MySQL</a>
23	<li><a href=http://www.garshol.priv.no/download/text/http-tut.html>HTTP explained</a>	22	<li><a href=http://www.garshol.priv.no/download/text/http-tut.html>HTTP explained</a>
24	</ul>	23	</ul>
25	Other pages:	24	Other pages:

Return to bug 54962

Lines 329-335 Link Here

(-)configure.old (-78 / +1 lines)
329	# include <unistd.h>	329	# include <unistd.h>
330	#endif"	330	#endif"
331		331
332	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'	332	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'
333	ac_subst_files=''	333	ac_subst_files=''
334		334
335	# Initialize some variables set by options.	335	# Initialize some variables set by options.
Lines 798-807 Link Here
798	ac_env_CPP_value=$CPP	798	ac_env_CPP_value=$CPP
799	ac_cv_env_CPP_set=${CPP+set}	799	ac_cv_env_CPP_set=${CPP+set}
800	ac_cv_env_CPP_value=$CPP	800	ac_cv_env_CPP_value=$CPP
801	ac_env_MYSQL_CONFIG_set=${MYSQL_CONFIG+set}
802	ac_env_MYSQL_CONFIG_value=$MYSQL_CONFIG
803	ac_cv_env_MYSQL_CONFIG_set=${MYSQL_CONFIG+set}
804	ac_cv_env_MYSQL_CONFIG_value=$MYSQL_CONFIG
805	ac_env_CXXCPP_set=${CXXCPP+set}	801	ac_env_CXXCPP_set=${CXXCPP+set}
806	ac_env_CXXCPP_value=$CXXCPP	802	ac_env_CXXCPP_value=$CXXCPP
807	ac_cv_env_CXXCPP_set=${CXXCPP+set}	803	ac_cv_env_CXXCPP_set=${CXXCPP+set}
Lines 903-910 Link Here
903	CXX C++ compiler command	899	CXX C++ compiler command
904	CXXFLAGS C++ compiler flags	900	CXXFLAGS C++ compiler flags
905	CPP C preprocessor	901	CPP C preprocessor
906	MYSQL_CONFIG
907	mysql_config program
908	CXXCPP C++ preprocessor	902	CXXCPP C++ preprocessor
909		903
910	Use these variables to override the choices made by `configure' or to help	904	Use these variables to override the choices made by `configure' or to help
Lines 5258-5331 Link Here
5258		5252
5259		5253
5260		5254
5261	if test -z "$MYSQL_CONFIG"; then
5262	# Extract the first word of "mysql_config", so it can be a program name with args.
5263	set dummy mysql_config; ac_word=$2
5264	echo "$as_me:$LINENO: checking for $ac_word" >&5
5265	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5266	if test "${ac_cv_path_MYSQL_CONFIG+set}" = set; then
5267	echo $ECHO_N "(cached) $ECHO_C" >&6
5268	else
5269	case $MYSQL_CONFIG in
5270	[\\/]* \| ?:[\\/]*)
5271	ac_cv_path_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test with a path.
5272	;;
5273	*)
5274	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5275	as_dummy="$PATH:/usr/local/mysql/bin"
5276	for as_dir in $as_dummy
5277	do
5278	IFS=$as_save_IFS
5279	test -z "$as_dir" && as_dir=.
5280	for ac_exec_ext in '' $ac_executable_extensions; do
5281	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5282	ac_cv_path_MYSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
5283	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5284	break 2
5285	fi
5286	done
5287	done
5288
5289	;;
5290	esac
5291	fi
5292	MYSQL_CONFIG=$ac_cv_path_MYSQL_CONFIG
5293
5294	if test -n "$MYSQL_CONFIG"; then
5295	echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
5296	echo "${ECHO_T}$MYSQL_CONFIG" >&6
5297	else
5298	echo "$as_me:$LINENO: result: no" >&5
5299	echo "${ECHO_T}no" >&6
5300	fi
5301
5302	fi
5303	if test -z "$MYSQL_CONFIG"
5304	then
5305	{ { echo "$as_me:$LINENO: error: mysql_config executable not found" >&5
5306	echo "$as_me: error: mysql_config executable not found" >&2;}
5307	{ (exit 1); exit 1; }; }
5308	else
5309	echo "$as_me:$LINENO: checking mysql libraries" >&5
5310	echo $ECHO_N "checking mysql libraries... $ECHO_C" >&6
5311	MYSQL_LIBS=`${MYSQL_CONFIG} --libs`
5312	echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
5313	echo "${ECHO_T}$MYSQL_LIBS" >&6
5314	echo "$as_me:$LINENO: checking mysql includes" >&5
5315	echo $ECHO_N "checking mysql includes... $ECHO_C" >&6
5316	MYSQL_CFLAGS=`${MYSQL_CONFIG} --cflags`
5317	echo "$as_me:$LINENO: result: $MYSQL_CFLAGS" >&5
5318	echo "${ECHO_T}$MYSQL_CFLAGS" >&6
5319	fi
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329	ac_header_dirent=no	5255	ac_header_dirent=no
5330	for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do	5256	for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
5331	as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" \| $as_tr_sh`	5257	as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" \| $as_tr_sh`
Lines 8560-8568 Link Here
8560	s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t	8486	s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
8561	s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t	8487	s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
8562	s,@GRXLIBS@,$GRXLIBS,;t t	8488	s,@GRXLIBS@,$GRXLIBS,;t t
8563	s,@MYSQL_CONFIG@,$MYSQL_CONFIG,;t t
8564	s,@MYSQL_LIBS@,$MYSQL_LIBS,;t t
8565	s,@MYSQL_CFLAGS@,$MYSQL_CFLAGS,;t t
8566	s,@EGREP@,$EGREP,;t t	8489	s,@EGREP@,$EGREP,;t t
8567	s,@CXXCPP@,$CXXCPP,;t t	8490	s,@CXXCPP@,$CXXCPP,;t t
8568	s,@LIBOBJS@,$LIBOBJS,;t t	8491	s,@LIBOBJS@,$LIBOBJS,;t t

Lines 1044-1069 Link Here

(-)aclocal.m4.old (-20 lines)
1044		1044
1045	dnl $Id: aclocal.m4,v 1.120 2004/06/23 00:36:57 boincadm Exp $	1045	dnl $Id: aclocal.m4,v 1.120 2004/06/23 00:36:57 boincadm Exp $
1046		1046
1047	AC_DEFUN([AC_CHECK_MYSQL],[
1048	AC_ARG_VAR([MYSQL_CONFIG], [mysql_config program])
1049	if test -z "$MYSQL_CONFIG"; then
1050	AC_PATH_PROG(MYSQL_CONFIG,mysql_config,,[$PATH:/usr/local/mysql/bin])
1051	fi
1052	if test -z "$MYSQL_CONFIG"
1053	then
1054	AC_MSG_ERROR([mysql_config executable not found])
1055	else
1056	AC_MSG_CHECKING(mysql libraries)
1057	MYSQL_LIBS=`${MYSQL_CONFIG} --libs`
1058	AC_MSG_RESULT($MYSQL_LIBS)
1059	AC_MSG_CHECKING(mysql includes)
1060	MYSQL_CFLAGS=`${MYSQL_CONFIG} --cflags`
1061	AC_MSG_RESULT($MYSQL_CFLAGS)
1062	fi
1063	AC_SUBST(MYSQL_LIBS)
1064	AC_SUBST(MYSQL_CFLAGS)
1065	])
1066
1067	# The contents of this file are subject to the BOINC Public License	1047	# The contents of this file are subject to the BOINC Public License
1068	# Version 1.0 (the "License"); you may not use this file except in	1048	# Version 1.0 (the "License"); you may not use this file except in
1069	# compliance with the License. You may obtain a copy of the License at	1049	# compliance with the License. You may obtain a copy of the License at

Lines 1-11 Link Here

(-)Makefile.incl.old (-6 lines)
1	## --Makefile --	1	## --Makefile --
2	## $Id: Makefile.incl,v 1.12 2004/06/12 04:45:14 davea Exp $	2	## $Id: Makefile.incl,v 1.12 2004/06/12 04:45:14 davea Exp $
3		3
4	# Note: MYSQL_CFLAGS and MYSQL_LIBS set by configure from mysql_config
5
6	MYSQL_LIBS = @MYSQL_LIBS@
7	MYSQL_CFLAGS = @MYSQL_CFLAGS@
8
9	RSA_LIBS = \	4	RSA_LIBS = \
10	-L$(top_builddir)/RSAEuro/source \	5	-L$(top_builddir)/RSAEuro/source \
11	-lrsaeuro	6	-lrsaeuro
Lines 21-27 Link Here
21	-I$(top_srcdir)/client \	16	-I$(top_srcdir)/client \
22	-I$(top_srcdir)/tools \	17	-I$(top_srcdir)/tools \
23	-I$(top_srcdir)/sched \	18	-I$(top_srcdir)/sched \
24	$(MYSQL_CFLAGS) \
25	-include $(top_builddir)/config.h	19	-include $(top_builddir)/config.h
26		20
27	# this is useful as a dependency to make sure librsaeuro gets compiled before	21	# this is useful as a dependency to make sure librsaeuro gets compiled before

Lines 14-21 Link Here

(-)client/Makefile.in.old (-6 lines)
14		14
15	@SET_MAKE@	15	@SET_MAKE@
16		16
17	# Note: MYSQL_CFLAGS and MYSQL_LIBS set by configure from mysql_config
18
19	srcdir = @srcdir@	17	srcdir = @srcdir@
20	top_srcdir = @top_srcdir@	18	top_srcdir = @top_srcdir@
21	VPATH = @srcdir@	19	VPATH = @srcdir@
Lines 82-91 Link Here
82	MAJOR_VERSION = @MAJOR_VERSION@	80	MAJOR_VERSION = @MAJOR_VERSION@
83	MAKEINFO = @MAKEINFO@	81	MAKEINFO = @MAKEINFO@
84	MINOR_VERSION = @MINOR_VERSION@	82	MINOR_VERSION = @MINOR_VERSION@
85	MYSQL_CFLAGS = @MYSQL_CFLAGS@
86	MYSQL_CONFIG = @MYSQL_CONFIG@
87		83
88	MYSQL_LIBS = @MYSQL_LIBS@
89	OBJEXT = @OBJEXT@	84	OBJEXT = @OBJEXT@
90	PACKAGE = @PACKAGE@	85	PACKAGE = @PACKAGE@
91	PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@	86	PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Lines 162-168 Link Here
162	-I$(top_srcdir)/client \	157	-I$(top_srcdir)/client \
163	-I$(top_srcdir)/tools \	158	-I$(top_srcdir)/tools \
164	-I$(top_srcdir)/sched \	159	-I$(top_srcdir)/sched \
165	$(MYSQL_CFLAGS) \
166	-include $(top_builddir)/config.h	160	-include $(top_builddir)/config.h
167		161
168		162