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

Commit60ea34b

Browse files
committed
Changes:
* reverse the change #include <> -> "" in krb.c. It _must not_ include files in "."* Makefile update. Inconsistent var usage and SHLIB was not set.Now it should work with all external libs.arko Kreen
1 parentd18c1d1 commit60ea34b

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

‎contrib/pgcrypto/Makefile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/pgcrypto/Makefile,v 1.2 2001/01/24 03:46:16 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/pgcrypto/Makefile,v 1.3 2001/02/20 15:34:14 momjian Exp $
33
#
44

55
subdir = contrib/pgcrypto
@@ -12,34 +12,37 @@ cryptolib = builtin
1212
##########################
1313

1414
ifeq ($(cryptolib), builtin)
15-
SRCS= md5.c sha1.c internal.c
15+
CRYPTO_CFLAGS =
16+
CRYPTO_LDFLAGS =
17+
SRCS = md5.c sha1.c internal.c
1618
endif
1719

1820
ifeq ($(cryptolib), openssl)
19-
cryptoinc := -I/usr/include/openssl
20-
cryptolib := -lcrypto
21+
CRYPTO_CFLAGS= -I/usr/include/openssl
22+
CRYPTO_LDFLAGS= -lcrypto
2123
SRCS = openssl.c
2224
endif
2325

2426
ifeq ($(cryptolib), mhash)
25-
cryptoinc=
26-
cryptolib=-lmhash
27-
SRCS=mhash.c
27+
CRYPTO_CFLAGS = -I/usr/local/include
28+
CRYPTO_LDFLAGS = -L/usr/local/lib-lmhash
29+
SRCS =mhash.c
2830
endif
2931

3032
ifeq ($(cryptolib), krb5)
31-
cryptoinc=-I/usr/include
32-
cryptolib=-ldes
33-
SRCS=krb.c
33+
CRYPTO_CFLAGS =-I/usr/include
34+
CRYPTO_LDFLAGS =-ldes
35+
SRCS =krb.c
3436
endif
3537

3638
NAME:= pgcrypto
3739
SRCS+= pgcrypto.c encode.c
3840
OBJS:=$(SRCS:.c=.o)
41+
SHLIB_LINK :=$(CRYPTO_LDFLAGS)
3942
SO_MAJOR_VERSION = 0
4043
SO_MINOR_VERSION = 1
4144

42-
overrideCPPFLAGS+=-I$(srcdir)$(cryptoinc)
45+
overrideCPPFLAGS+=$(CRYPTO_CFLAGS) -I$(srcdir)
4346

4447
all: all-lib$(NAME).sql
4548

‎contrib/pgcrypto/krb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
*It is possible that this works with other SHA1/MD5
3232
*implementations too.
3333
*
34-
* $Id: krb.c,v 1.2 2001/02/10 02:31:25 tgl Exp $
34+
* $Id: krb.c,v 1.3 2001/02/20 15:34:14 momjian Exp $
3535
*/
3636

3737
#include"postgres.h"
3838

3939
#include"pgcrypto.h"
4040

41-
#include"md5.h"
42-
#include"sha.h"
41+
#include<md5.h>
42+
#include<sha.h>
4343

4444
#ifndefMD5_DIGEST_LENGTH
4545
#defineMD5_DIGEST_LENGTH 16

0 commit comments

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