git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support PIPECONNECT with helo_data using the local IP, when interface is known.
[exim.git]
/
src
/
src
/
buildconfig.c
diff --git
a/src/src/buildconfig.c
b/src/src/buildconfig.c
index 426714f9113dee0ea6e1c57d71aab8d39972b0a2..a7f5812b2ae8898dca679fdb5a541965538b82a0 100644
(file)
--- a/
src/src/buildconfig.c
+++ b/
src/src/buildconfig.c
@@
-51,7
+51,7
@@
typedef struct {
char *data;
} save_item;
char *data;
} save_item;
-static const char *db_opts[] = { "", "USE_DB", "USE_GDBM", "USE_TDB" };
+static const char *db_opts[] = { "", "USE_DB", "USE_GDBM", "USE_TDB"
, "USE_NDBM"
};
static int have_ipv6 = 0;
static int have_iconv = 0;
static int have_ipv6 = 0;
static int have_iconv = 0;
@@
-111,6
+111,7
@@
unsigned long test_ulong_t = 0L;
unsigned int test_uint_t = 0;
#endif
long test_long_t = 0;
unsigned int test_uint_t = 0;
#endif
long test_long_t = 0;
+long long test_longlong_t = 0;
int test_int_t = 0;
FILE *base;
FILE *new;
int test_int_t = 0;
FILE *base;
FILE *new;
@@
-155,15
+156,16
@@
This assumption is known to be OK for the common operating systems. */
fprintf(new, "#ifndef OFF_T_FMT\n");
if (sizeof(test_off_t) > sizeof(test_long_t))
fprintf(new, "#ifndef OFF_T_FMT\n");
if (sizeof(test_off_t) > sizeof(test_long_t))
- {
fprintf(new, "# define OFF_T_FMT \"%%lld\"\n");
fprintf(new, "# define OFF_T_FMT \"%%lld\"\n");
- fprintf(new, "# define LONGLONG_T long long int\n");
- }
else
else
- {
fprintf(new, "# define OFF_T_FMT \"%%ld\"\n");
fprintf(new, "# define OFF_T_FMT \"%%ld\"\n");
+fprintf(new, "#endif\n\n");
+
+fprintf(new, "#ifndef LONGLONG_T\n");
+if (sizeof(test_longlong_t) > sizeof(test_long_t))
+ fprintf(new, "# define LONGLONG_T long long int\n");
+else
fprintf(new, "# define LONGLONG_T long int\n");
fprintf(new, "# define LONGLONG_T long int\n");
- }
fprintf(new, "#endif\n\n");
/* Now do the same thing for time_t variables. If the length is greater than
fprintf(new, "#endif\n\n");
/* Now do the same thing for time_t variables. If the length is greater than
@@
-219,8
+221,7
@@
else
/* Now search the makefile for certain settings */
/* Now search the makefile for certain settings */
-base = fopen("Makefile", "rb");
-if (base == NULL)
+if (!(base = fopen("Makefile", "rb")))
{
printf("*** Buildconfig: failed to open Makefile\n");
(void)fclose(new);
{
printf("*** Buildconfig: failed to open Makefile\n");
(void)fclose(new);
@@
-385,7
+386,6
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
encountered. */
for (i = 1; i < sizeof(db_opts)/sizeof(char *); i++)
encountered. */
for (i = 1; i < sizeof(db_opts)/sizeof(char *); i++)
- {
if (strcmp(name, db_opts[i]) == 0)
{
if (use_which_db == i)
if (strcmp(name, db_opts[i]) == 0)
{
if (use_which_db == i)
@@
-395,7
+395,6
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
fprintf(new, "/* %s not set */\n", name);
break;
}
fprintf(new, "/* %s not set */\n", name);
break;
}
- }
if (i < sizeof(db_opts)/sizeof(char *)) continue;
/* EXIM_USER is a special case. We look in the environment for EXIM_USER or
if (i < sizeof(db_opts)/sizeof(char *)) continue;
/* EXIM_USER is a special case. We look in the environment for EXIM_USER or
@@
-753,15
+752,15
@@
else if (isgroup)
continue;
}
continue;
}
- /* DISABLE_DKIM is special; must be forced if
no SUPPORT
_TLS */
+ /* DISABLE_DKIM is special; must be forced if
DISABLE
_TLS */
if (strcmp(name, "DISABLE_DKIM") == 0)
{
char *d_dkim = getenv("DISABLE_DKIM");
if (strcmp(name, "DISABLE_DKIM") == 0)
{
char *d_dkim = getenv("DISABLE_DKIM");
- char *
tls = getenv("SUPPORT
_TLS");
+ char *
notls = getenv("DISABLE
_TLS");
if (d_dkim)
fprintf(new, "#define DISABLE_DKIM yes\n");
if (d_dkim)
fprintf(new, "#define DISABLE_DKIM yes\n");
- else if (
!
tls)
+ else if (
no
tls)
fprintf(new, "#define DISABLE_DKIM yes /* forced by lack of TLS */\n");
else
fprintf(new, "/* DISABLE_DKIM not set */\n");
fprintf(new, "#define DISABLE_DKIM yes /* forced by lack of TLS */\n");
else
fprintf(new, "/* DISABLE_DKIM not set */\n");