Skip to content

Commit 44c3619

Browse files
committed
Stop pretending that we use autotools to build config.h
We have not been using autotools since commit e0978a8 so stop pretending that we do related to config.h and instead directly have the necessary defines with the right names in pg_tde.h.
1 parent c106658 commit 44c3619

File tree

7 files changed

+5
-54
lines changed

7 files changed

+5
-54
lines changed

contrib/pg_tde/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ src/catalog/tde_principal_key.o \
4545
src/common/pg_tde_shmem.o \
4646
src/common/pg_tde_utils.o \
4747
src/smgr/pg_tde_smgr.o \
48-
src/pg_tde_defs.o \
4948
src/pg_tde_event_capture.o \
5049
src/pg_tde_guc.o \
5150
src/pg_tde.o \

contrib/pg_tde/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ pg_tde_sources = files(
1818
'src/keyring/keyring_kmip_impl.c',
1919
'src/keyring/keyring_vault.c',
2020
'src/pg_tde.c',
21-
'src/pg_tde_defs.c',
2221
'src/pg_tde_event_capture.c',
2322
'src/pg_tde_guc.c',
2423
'src/smgr/pg_tde_smgr.c',

contrib/pg_tde/src/include/config.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

contrib/pg_tde/src/include/pg_tde.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#ifndef PG_TDE_H
99
#define PG_TDE_H
1010

11+
#define PG_TDE_NAME "pg_tde"
12+
#define PG_TDE_VERSION "1.0.0-rc"
13+
#define PG_TDE_VERSION_STRING PG_TDE_NAME " " PG_TDE_VERSION
14+
1115
#define PG_TDE_DATA_DIR "pg_tde"
1216

1317
typedef struct XLogExtensionInstall

contrib/pg_tde/src/include/pg_tde_defs.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

contrib/pg_tde/src/pg_tde.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "keyring/keyring_vault.h"
3333
#include "keyring/keyring_kmip.h"
3434
#include "utils/builtins.h"
35-
#include "pg_tde_defs.h"
3635
#include "smgr/pg_tde_smgr.h"
3736
#include "catalog/tde_global_space.h"
3837
#include "utils/percona.h"
@@ -222,7 +221,7 @@ run_extension_install_callbacks(XLogExtensionInstall *xlrec, bool redo)
222221
Datum
223222
pg_tde_version(PG_FUNCTION_ARGS)
224223
{
225-
PG_RETURN_TEXT_P(cstring_to_text(pg_tde_package_string()));
224+
PG_RETURN_TEXT_P(cstring_to_text(PG_TDE_VERSION_STRING));
226225
}
227226

228227
Datum

contrib/pg_tde/src/pg_tde_defs.c

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)