FreeTDS Development Group

["James K. Lowden" <jklowden AT freetds.org>]

Craig A. Berry wrote:
> --- include/replacements.h;-0   Fri Jul  8 03:22:52 2005
> +++ include/replacements.h      Sun Dec 18 16:13:06 2005
> @@ -53,8 +53,8 @@
>   char *strtok_r(char *str, const char *sep, char **lasts);
>   #endif /* !HAVE_STRTOK_R */
> 
> -#if !HAVE_READPASSPHRASE
> -# include <../src/replacements/readpassphrase.h>
> +#ifndef HAVE_READPASSPHRASE
> +# include "readpassphrase.h"
>   #else
>   # include <readpassphrase.h>
>   #endif
> [end of patch]
> 
> and then add whatever -I directives are necessary to make the include
> file findable. (The easy way to do the latter, of course, would be to
> simply move it from src/replacments to include/).
> 
> Does this make sense?

Hi Craig, 

At first blush, yes.  

I'm a little puzzled why the tree information is a problem.  In Unix
environments, you'd have a hard time getting the build to work if you
disturb the relationship between include/ and src/.  

Moving the replacement code to include/ is a big deal because it affects
CVS.  I could look at ways to have the autotools copy the replacement code
to include/replacements/ at build time.  Then the source would say 

        # include "replacements/readpassphrase.h"

which is at least intuitive.  

Regards, 

--jkl