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

Commit74618e2

Browse files
committed
Another round of those unportable config/build changes :-/
* Add option to build with OpenSSL out of the box. Fix thusly exposed bit rot. Although it compiles now, getting this to do something useful is left as an exercise.* Fix Kerberos options to defer checking for required libraries until all the other libraries are checked for.* Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc.* Install work around for Autoconf's install-sh relative path anomaly. Get rid of old INSTL_*_OPTS variables, now that we don't need them anymore.* Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX.* Look for only one of readline.h or readline/readline.h, not both.* Make check for PS_STRINGS cacheable. Don't test for the header files separately.* Disable fcntl(F_SETLK) test on Linux.* Substitute the standard GCC warnings set into CFLAGS in configure, don't add it on in Makefile.global.* Sweep through contrib tree to teach makefiles standard semantics.... and in completely unrelated news:* Make postmaster.opts arbitrary options-aware. I still think we need to save the environment as well.
1 parentb59c03f commit74618e2

File tree

37 files changed

+1801
-1980
lines changed

37 files changed

+1801
-1980
lines changed

‎configure

Lines changed: 1167 additions & 954 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 205 additions & 99 deletions
Large diffs are not rendered by default.

‎contrib/Makefile

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#
22
# The PostgreSQL contrib tree Makefile
33
#
4-
#Portions Copyright (c) 1999-2000, PostgreSQL, Inc
5-
#
6-
# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.5 2000/06/19 13:52:59 momjian Exp $
4+
# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.6 2000/07/09 13:12:57 petere Exp $
75
#
86

9-
TOPDIR = ..
10-
include Makefile.global
7+
subdir = contrib
8+
top_builddir = ..
9+
include ../src/Makefile.global
1110

1211
WANTED_DIRS =array\
1312
earthdistance\
@@ -25,34 +24,22 @@ WANTED_DIRS =array\
2524
spi\
2625
string\
2726
tips\
28-
tools\
2927
unixdate\
3028
userlock\
3129
vacuumlo
3230
#odbc
3331

34-
35-
all:
32+
all.DEFAULT:
3633
fordirin$(WANTED_DIRS);do \
3734
if [-e$$dir/Makefile ];then \
3835
$(MAKE) -C$$dir$@;\
3936
fi;\
4037
done
4138

42-
4339
install:
44-
../config/mkinstalldirs$(CONTRIB_BINDIR)$(CONTRIB_MODDIR)$(CONTRIB_DOCDIR)$(CONTRIB_SQLDIR)$(CONTRIB_EXAMPLESDIR)
45-
fordirin$(WANTED_DIRS);do \
46-
if [-e$$dir/Makefile ];then \
47-
$(MAKE) -C$$dir$@;\
48-
fi;\
49-
done
50-
$(INSTALL)$(INSTL_LIB_OPTS) Contrib.index$(CONTRIB_DOCDIR);
51-
52-
53-
.DEFAULT:
5440
fordirin$(WANTED_DIRS);do \
5541
if [-e$$dir/Makefile ];then \
5642
$(MAKE) -C$$dir$@;\
5743
fi;\
5844
done
45+
$(INSTALL_DATA) Contrib.index$(docdir)/contrib

‎contrib/Makefile.global

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

‎contrib/array/Makefile

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,38 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.11 2000/07/04 16:16:43 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.12 2000/07/09 13:12:59 petere Exp $
33
#
44

5-
TOPDIR=../..
5+
subdir = contrib/array
6+
top_builddir = ../..
7+
include ../../src/Makefile.global
68

7-
include ../Makefile.global
8-
9-
NAME= array_iterator
10-
11-
PROGRAM=
12-
OBJS=$(NAME).o
13-
DOCS= README.$(NAME)
14-
SQLS=$(NAME).sql
15-
BINS=
16-
EXAMPLES=
17-
MODS=$(NAME)$(DLSUFFIX)
9+
NAME:= array_iterator
10+
SONAME:=$(NAME)$(DLSUFFIX)
1811

1912
CFLAGS += -I.$(CFLAGS_SL)
2013

21-
OTHER_CLEAN =$(SQLS)
22-
23-
all:$(MODS)$(SQLS)
14+
all:$(SONAME)$(NAME).sql
2415

25-
%.sql:%.sql.in
26-
$(SED)"s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|"<$<>$@
16+
$(NAME).sql:$(NAME).sql.in
17+
sed -e's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g'<$<>$@
2718

28-
install: install_doc install_sql install_mod
19+
install: all installdirs
20+
$(INSTALL_DATA) README.$(NAME)$(docdir)/contrib
21+
$(INSTALL_DATA)$(NAME).sql$(datadir)/contrib
22+
$(INSTALL_SHLIB)$(SONAME)$(libdir)/contrib
2923

30-
install_doc:
31-
forinst_filein$(DOCS);do \
32-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_DOCDIR);\
33-
done
24+
installdirs:
25+
$(mkinstalldirs)$(docdir)/contrib$(datadir)/contrib$(libdir)/contrib
3426

35-
install_sql:
36-
forinst_filein$(SQLS);do \
37-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_SQLDIR);\
38-
done
39-
40-
install_mod:
41-
forinst_filein$(MODS);do \
42-
$(INSTALL)$(INSTL_SHLIB_OPTS)$$inst_file$(CONTRIB_MODDIR);\
43-
done
27+
uninstall:
28+
rm -rf$(docdir)/contrib/README.$(NAME)$(datadir)/contrib/$(NAME).sql$(libdir)/contrib/$(SONAME)
4429

30+
cleandistcleanmaintainer-clean:
31+
rm -f$(SONAME)$(NAME).sql
4532

4633
dependdep:
4734
$(CC) -MM -MG$(CFLAGS)*.c> depend
4835

49-
clean:
50-
$(RM)*~$(OBJS)$(MODS)$(PROGRAM) depend$(OTHER_CLEAN) core log
51-
5236
ifeq (depend,$(wildcard depend))
5337
include depend
5438
endif

‎contrib/earthdistance/Makefile

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,38 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.5 2000/07/04 16:16:44 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.6 2000/07/09 13:13:00 petere Exp $
33
#
44

5-
TOPDIR=../..
5+
subdir = contrib/earthdistance
6+
top_builddir = ../..
7+
include ../../src/Makefile.global
68

7-
include ../Makefile.global
8-
9-
NAME= earthdistance
10-
11-
PROGRAM=
12-
OBJS=$(NAME).o
13-
DOCS= README.$(NAME)
14-
SQLS=$(NAME).sql
15-
BINS =
16-
EXAMPLES=
17-
MODS=$(NAME)$(DLSUFFIX)
9+
NAME:= earthdistance
10+
SONAME:=$(NAME)$(DLSUFFIX)
1811

1912
CFLAGS += -I.$(CFLAGS_SL)
2013

21-
OTHER_CLEAN =$(SQLS)
14+
all:$(SONAME)$(NAME).sql
2215

23-
all:$(MODS)$(SQLS)
16+
$(NAME).sql:$(NAME).sql.in
17+
sed -e's:MODULE_PATHNAME:$(datadir)/contrib/$(SONAME):g'<$<>$@
2418

25-
%.sql:%.sql.in
26-
$(SED)"s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|"<$<>$@
19+
install: all installdirs
20+
$(INSTALL_SHLIB)$(SONAME)$(libdir)/contrib
21+
$(INSTALL_DATA)$(NAME).sql$(datadir)/contrib
22+
$(INSTALL_DATA) README.$(NAME)$(docdir)/contrib
2723

28-
install: install_doc install_sql install_mod
24+
installdirs:
25+
$(mkinstalldirs)$(libdir)/contrib$(datadir)/contrib$(docdir)/contrib
2926

30-
install_doc:
31-
forinst_filein$(DOCS);do \
32-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_DOCDIR);\
33-
done
27+
uninstall:
28+
rm -f$(libdir)/contrib/$(SONAME)$(datadir)/contrib/$(NAME).sql$(docdir)/contrib/README.$(NAME)
3429

35-
install_sql:
36-
forinst_filein$(SQLS);do \
37-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_SQLDIR);\
38-
done
39-
40-
install_mod:
41-
forinst_filein$(MODS);do \
42-
$(INSTALL)$(INSTL_SHLIB_OPTS)$$inst_file$(CONTRIB_MODDIR);\
43-
done
30+
cleandistcleanmaintainer-clean:
31+
rm -f$(SONAME)$(NAME).sql
4432

4533
dependdep:
4634
$(CC) -MM -MG$(CFLAGS)*.c> depend
4735

48-
clean:
49-
$(RM)*~$(OBJS)$(MODS)$(PROGRAM) depend$(OTHER_CLEAN) core log
50-
5136
ifeq (depend,$(wildcard depend))
5237
include depend
5338
endif

‎contrib/findoidjoins/Makefile

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,26 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.7 2000/06/19 13:53:22 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
33
#
44

5-
TOPDIR=../..
5+
subdir = contrib/findoidjoins
6+
top_builddir = ../..
7+
include ../../src/Makefile.global
68

7-
include ../Makefile.global
9+
CFLAGS+= -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
10+
LIBS+=$(LIBPGEASY)
811

9-
NAME= findoidjoins
12+
all: findoidjoins
1013

11-
PROGRAM=$(NAME)
12-
OBJS=$(NAME).o
13-
DOCS= README.$(NAME)
14-
SQLS=
15-
BINS =$(PROGRAM) make_oidjoins_check
16-
EXAMPLES=
17-
MODS=
14+
install: all installdirs
15+
$(INSTALL_PROGRAM) findoidjoins$(X)$(bindir)
16+
$(INSTALL_SCRIPT) make_oidjoins_check$(bindir)
17+
$(INSTALL_DATA) README.findoidjoins$(docdir)/contrib
1818

19-
CFLAGS += -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
19+
installdirs:
20+
$(mkinstalldirs)$(bindir)$(docdir)/contrib
2021

21-
OTHER_CLEAN =
22+
uninstall:
23+
rm -f$(bindir)/findoidjoins$(X)$(bindir)/make_oidjoins_check$(docdir)/contrib/README.findoidjoins
2224

23-
24-
all:$(PROGRAM)
25-
26-
$(PROGRAM):$(OBJS)$(LIBPGEASYDIR)/libpgeasy.a
27-
$(CC)$(CFLAGS) -o$@$(OBJS)$(LIBPGEASY)
28-
29-
30-
install: install_doc nstall_bin
31-
32-
install_doc:
33-
forinst_filein$(DOCS);do \
34-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_DOCDIR);\
35-
done
36-
37-
install_bin:
38-
forinst_filein$(BINS);do \
39-
$(INSTALL)$(INSTL_EXE_OPTS)$$inst_file$(CONTRIB_BINDIR);\
40-
done
41-
42-
dependdep:
43-
$(CC) -MM -MG$(CFLAGS)*.c> depend
44-
45-
clean:
46-
$(RM)*~$(OBJS)$(MODS)$(PROGRAM) depend$(OTHER_CLEAN) core log
47-
48-
ifeq (depend,$(wildcard depend))
49-
include depend
50-
endif
25+
cleandistcleanmaintainer-clean:
26+
rm -f findoidjoins$(X)

‎contrib/fulltextindex/BENCH

Whitespace-only changes.

‎contrib/fulltextindex/Makefile

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,40 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.6 2000/07/04 16:16:48 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.7 2000/07/09 13:13:07 petere Exp $
33
#
44

5-
TOPDIR=../..
5+
subdir = contrib/fulltextindex
6+
top_builddir = ../..
7+
include ../../src/Makefile.global
68

7-
include ../Makefile.global
8-
9-
NAME= fti
10-
11-
PROGRAM=
12-
OBJS=$(NAME).o
13-
DOCS= README.$(NAME)
14-
SQLS=$(NAME).sql
15-
BINS= fti.pl
16-
EXAMPLES=
17-
MODS=$(NAME)$(DLSUFFIX)
9+
NAME:= fti
10+
SONAME:=$(NAME)$(DLSUFFIX)
1811

1912
CFLAGS += -I.$(CFLAGS_SL)
2013

21-
OTHER_CLEAN =$(SQLS)
22-
23-
all:$(MODS)$(SQLS)
14+
all:$(SONAME)$(NAME).sql
2415

25-
%.sql:%.sql.in
26-
$(SED)"s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|"<$<>$@
16+
$(NAME).sql:$(NAME).sql.in
17+
sed -e's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g'<$<>$@
2718

28-
install: install_doc install_sql install_mod install_bin
19+
install: all installdirs
20+
$(INSTALL_SCRIPT) fti.pl$(bindir)
21+
$(INSTALL_SHLIB)$(SONAME)$(libdir)/contrib
22+
$(INSTALL_DATA)$(NAME).sql$(datadir)/contrib
23+
$(INSTALL_DATA) README.$(NAME)$(docdir)/contrib
2924

30-
install_doc:
31-
forinst_filein$(DOCS);do \
32-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_DOCDIR);\
33-
done
25+
installdirs:
26+
$(mkinstalldirs)$(bindir)$(libdir)/contrib$(datadir)/contrib$(docdir)/contrib
3427

35-
install_sql:
36-
forinst_filein$(SQLS);do \
37-
$(INSTALL)$(INSTL_LIB_OPTS)$$inst_file$(CONTRIB_SQLDIR);\
38-
done
28+
uninstall:
29+
rm -f$(bindir)/fti.pl$(libdir)/contrib/$(SONAME)\
30+
$(datadir)/contrib/$(NAME).sql$(docdir)/contrib/README.$(NAME)
3931

40-
install_mod:
41-
forinst_filein$(MODS);do \
42-
$(INSTALL)$(INSTL_SHLIB_OPTS)$$inst_file$(CONTRIB_MODDIR);\
43-
done
44-
45-
install_bin:
46-
forinst_filein$(BINS);do \
47-
$(INSTALL)$(INSTL_EXE_OPTS)$$inst_file$(CONTRIB_BINDIR);\
48-
done
32+
cleandistcleanmaintainer-clean:
33+
rm -f$(SONAME)$(NAME).sql
4934

5035
dependdep:
5136
$(CC) -MM -MG$(CFLAGS)*.c> depend
5237

53-
clean:
54-
$(RM)*~$(OBJS)$(MODS)$(PROGRAM) depend$(OTHER_CLEAN) core log
55-
5638
ifeq (depend,$(wildcard depend))
5739
include depend
5840
endif

0 commit comments

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