Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitad201b8

Browse files
committed
Remove --enable-syslog option
1 parenteef5c4f commitad201b8

File tree

6 files changed

+37
-71
lines changed

6 files changed

+37
-71
lines changed

‎configure‎

Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,6 @@ Optional Features:
858858
--enable-depend turn on automatic dependency tracking
859859
--enable-cassert enable assertion checks (for debugging)
860860
--enable-odbc build the ODBC driver package
861-
--enable-syslog enable logging to syslog
862861
863862
Optional Packages:
864863
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -12167,32 +12166,27 @@ fi
1216712166
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1216812167
1216912168
12170-
12171-
12172-
# Check whether --enable-syslog or --disable-syslog was given.
12173-
iftest"${enable_syslog+set}" =set;then
12174-
enableval="$enable_syslog"
12175-
12176-
case$enablevalin
12177-
yes)
12178-
echo"$as_me:$LINENO: checking for syslog">&5
12179-
echo$ECHO_N"checking for syslog...$ECHO_C">&6
12180-
iftest"${ac_cv_func_syslog+set}" =set;then
12169+
forac_funcin syslog
12170+
do
12171+
as_ac_var=`echo"ac_cv_func_$ac_func"|$as_tr_sh`
12172+
echo"$as_me:$LINENO: checking for$ac_func">&5
12173+
echo$ECHO_N"checking for$ac_func...$ECHO_C">&6
12174+
ifeval"test\"\${$as_ac_var+set}\" = set";then
1218112175
echo$ECHO_N"(cached)$ECHO_C">&6
1218212176
else
1218312177
cat>conftest.$ac_ext<<_ACEOF
1218412178
#line$LINENO "configure"
1218512179
#include "confdefs.h"
1218612180
/* System header to define __stub macros and hopefully few prototypes,
12187-
which can conflict with charsyslog (); below. */
12181+
which can conflict with char$ac_func (); below. */
1218812182
#include <assert.h>
1218912183
/* Override any gcc2 internal prototype to avoid an error. */
1219012184
#ifdef __cplusplus
1219112185
extern "C"
1219212186
#endif
1219312187
/* We use char because int might match the return type of a gcc2
1219412188
builtin and then its argument prototype would still apply. */
12195-
charsyslog ();
12189+
char$ac_func ();
1219612190
char (*f) ();
1219712191
1219812192
#ifdef F77_DUMMY_MAIN
@@ -12207,10 +12201,10 @@ main ()
1220712201
/* The GNU C library defines this for functions which it implements
1220812202
to always fail with ENOSYS. Some functions are actually named
1220912203
something starting with __ and the normal name is an alias. */
12210-
#if defined (__stub_syslog) || defined (__stub___syslog)
12204+
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
1221112205
choke me
1221212206
#else
12213-
f =syslog;
12207+
f =$ac_func;
1221412208
#endif
1221512209
1221612210
;
@@ -12229,44 +12223,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1222912223
ac_status=$?
1223012224
echo"$as_me:$LINENO:\$? =$ac_status">&5
1223112225
(exit$ac_status); }; };then
12232-
ac_cv_func_syslog=yes
12226+
eval"$as_ac_var=yes"
1223312227
else
1223412228
echo"$as_me: failed program was:">&5
1223512229
cat conftest.$ac_ext>&5
12236-
ac_cv_func_syslog=no
12230+
eval"$as_ac_var=no"
1223712231
fi
1223812232
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1223912233
fi
12240-
echo"$as_me:$LINENO: result:$ac_cv_func_syslog">&5
12241-
echo"${ECHO_T}$ac_cv_func_syslog">&6
12242-
iftest$ac_cv_func_syslog = yes;then
12243-
12244-
cat>>confdefs.h<<\_ACEOF
12245-
#define ENABLE_SYSLOG 1
12234+
echo"$as_me:$LINENO: result:`evalecho'${'$as_ac_var'}'`">&5
12235+
echo"${ECHO_T}`evalecho'${'$as_ac_var'}'`">&6
12236+
iftest`evalecho'${'$as_ac_var'}'` = yes;then
12237+
cat>>confdefs.h<<_ACEOF
12238+
#define`echo"HAVE_$ac_func"|$as_tr_cpp` 1
1224612239
_ACEOF
1224712240
12248-
else
12249-
{ {echo"$as_me:$LINENO: error: no syslog interface found">&5
12250-
echo"$as_me: error: no syslog interface found">&2;}
12251-
{ (exit 1);exit 1; }; }
1225212241
fi
12253-
12254-
;;
12255-
no)
12256-
:
12257-
;;
12258-
*)
12259-
{ {echo"$as_me:$LINENO: error: no argument expected for --enable-syslog option">&5
12260-
echo"$as_me: error: no argument expected for --enable-syslog option">&2;}
12261-
{ (exit 1);exit 1; }; }
12262-
;;
12263-
esac
12264-
12265-
else
12266-
enable_syslog=no
12267-
12268-
fi;
12269-
12242+
done
1227012243
1227112244
1227212245
echo"$as_me:$LINENO: checking for optreset">&5

‎configure.in‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.178 2002/04/14 17:23:20 petere Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.179 2002/04/21 00:22:52 ishii Exp $
33

44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -975,13 +975,7 @@ AC_TRY_LINK([#include <setjmp.h>],
975975
AC_MSG_RESULT(yes)],
976976
[AC_MSG_RESULT(no)])
977977

978-
979-
PGAC_ARG_BOOL(enable, syslog, no, [ --enable-syslog enable logging to syslog],
980-
[AC_CHECK_FUNC(syslog,
981-
[AC_DEFINE([ENABLE_SYSLOG], 1,
982-
[Define to 1 if to enable the syslogging code])],
983-
[AC_MSG_ERROR([no syslog interface found])])])
984-
978+
AC_CHECK_FUNCS([syslog])
985979

986980
AC_CACHE_CHECK([for optreset], pgac_cv_var_int_optreset,
987981
[AC_TRY_LINK([#include <unistd.h>],

‎src/backend/utils/error/elog.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.95 2002/04/04 04:43:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.96 2002/04/21 00:22:52 ishii Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -22,7 +22,7 @@
2222
#include<signal.h>
2323
#include<sys/time.h>
2424
#include<ctype.h>
25-
#ifdefENABLE_SYSLOG
25+
#ifdefHAVE_SYSLOG
2626
#include<syslog.h>
2727
#endif
2828

@@ -46,7 +46,7 @@ intclient_min_messages;
4646
char*client_min_messages_str=NULL;
4747
constcharclient_min_messages_str_default[]="notice";
4848

49-
#ifdefENABLE_SYSLOG
49+
#ifdefHAVE_SYSLOG
5050
/*
5151
* 0 = only stdout/stderr
5252
* 1 = stdout+stderr and syslog
@@ -351,7 +351,7 @@ elog(int lev, const char *fmt,...)
351351
* Message prepared; send it where it should go
352352
*/
353353

354-
#ifdefENABLE_SYSLOG
354+
#ifdefHAVE_SYSLOG
355355
/* Write to syslog, if enabled */
356356
if (output_to_server&&Use_syslog >=1)
357357
{
@@ -389,7 +389,7 @@ elog(int lev, const char *fmt,...)
389389

390390
write_syslog(syslog_level,msg_buf+timestamp_size);
391391
}
392-
#endif/*ENABLE_SYSLOG */
392+
#endif/*HAVE_SYSLOG */
393393

394394
/* syslog doesn't want a trailing newline, but other destinations do */
395395
strcat(msg_buf,"\n");
@@ -612,7 +612,7 @@ print_pid(void)
612612

613613

614614

615-
#ifdefENABLE_SYSLOG
615+
#ifdefHAVE_SYSLOG
616616

617617
#ifndefPG_SYSLOG_LIMIT
618618
#definePG_SYSLOG_LIMIT 128
@@ -733,7 +733,7 @@ write_syslog(int level, const char *line)
733733
syslog(level,"[%lu] %s",seq,line);
734734
}
735735
}
736-
#endif/*ENABLE_SYSLOG */
736+
#endif/*HAVE_SYSLOG */
737737

738738

739739
staticvoid

‎src/backend/utils/misc/guc.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Support for grand unified configuration scheme, including SET
55
* command, configuration file, and command line options.
66
*
7-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.65 2002/04/03 05:39:32 petere Exp $
7+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.66 2002/04/21 00:22:52 ishii Exp $
88
*
99
* Copyright 2000 by PostgreSQL Global Development Group
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -54,7 +54,7 @@ extern intCommitDelay;
5454
externintCommitSiblings;
5555
externboolFixBTree;
5656

57-
#ifdefENABLE_SYSLOG
57+
#ifdefHAVE_SYSLOG
5858
externchar*Syslog_facility;
5959
externchar*Syslog_ident;
6060
staticboolcheck_facility(constchar*facility);
@@ -394,7 +394,7 @@ static struct config_int
394394
1000,0,INT_MAX,NULL,NULL
395395
},
396396

397-
#ifdefENABLE_SYSLOG
397+
#ifdefHAVE_SYSLOG
398398
{
399399
"syslog",PGC_SIGHUP,PGC_S_DEFAULT,&Use_syslog,
400400
0,0,2,NULL,NULL
@@ -612,7 +612,7 @@ static struct config_string
612612
assign_server_min_messages
613613
},
614614

615-
#ifdefENABLE_SYSLOG
615+
#ifdefHAVE_SYSLOG
616616
{
617617
"syslog_facility",PGC_POSTMASTER,PGC_S_DEFAULT,&Syslog_facility,
618618
"LOCAL0",check_facility,NULL
@@ -1364,7 +1364,7 @@ ParseLongOption(const char *string, char **name, char **value)
13641364

13651365

13661366

1367-
#ifdefENABLE_SYSLOG
1367+
#ifdefHAVE_SYSLOG
13681368

13691369
staticbool
13701370
check_facility(constchar*facility)

‎src/include/pg_config.h.in‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your
99
* changes will be overwritten the next time you run configure.
1010
*
11-
* $Id: pg_config.h.in,v 1.21 2002/04/1022:47:09 petere Exp $
11+
* $Id: pg_config.h.in,v 1.22 2002/04/21 00:22:52 ishii Exp $
1212
*/
1313

1414
#ifndefPG_CONFIG_H
@@ -47,9 +47,6 @@
4747
/* Set to 1 if you want ASSERT checking (--enable-cassert) */
4848
#undef USE_ASSERT_CHECKING
4949

50-
/* Set to 1 to use syslog() to write postmaster log (--enable-syslog) */
51-
#undef ENABLE_SYSLOG
52-
5350
/* Define to build with Kerberos 4 support (--with-krb4[=DIR]) */
5451
#undef KRB4
5552

@@ -708,6 +705,8 @@ extern int fdatasync(int fildes);
708705
#undef HAVE_UINT64
709706
#undef HAVE_SIG_ATOMIC_T
710707

708+
/* Define if you have syslog() */
709+
#undef HAVE_SYSLOG
711710

712711
/*
713712
*------------------------------------------------------------------------

‎src/include/utils/elog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: elog.h,v 1.35 2002/03/06 06:23:20 momjian Exp $
10+
* $Id: elog.h,v 1.36 2002/04/21 00:22:52 ishii Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -41,7 +41,7 @@
4141
/*#define DEBUGDEBUG1*//* Backward compatibility with pre-7.3 */
4242

4343
/* Configurable parameters */
44-
#ifdefENABLE_SYSLOG
44+
#ifdefHAVE_SYSLOG
4545
externintUse_syslog;
4646
#endif
4747
externboolLog_timestamp;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp