Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ef7152f

Browse files
committed
Put the right runpath to libpq into the Perl module shared object on more
platforms and without relinking. Also support VPATH builds and DESTDIR installs. One hopes.
1 parent 8e0d642 commit ef7152f

File tree

7 files changed

+555
-427
lines changed

7 files changed

+555
-427
lines changed

aclocal.m4

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.12 2001/03/05 09:38:54 peter Exp $
1+
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.13 2001/08/26 22:28:03 petere Exp $
22
builtin([include], [config/ac_func_accept_argtypes.m4])
33
builtin([include], [config/c-compiler.m4])
44
builtin([include], [config/c-library.m4])
@@ -7,6 +7,7 @@ builtin([include], [config/docbook.m4])
77
builtin([include], [config/general.m4])
88
builtin([include], [config/java.m4])
99
builtin([include], [config/libtool.m4])
10+
builtin([include], [config/perl.m4])
1011
builtin([include], [config/programs.m4])
1112
builtin([include], [config/python.m4])
1213
builtin([include], [config/tcl.m4])

config/perl.m4

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# $Header: /cvsroot/pgsql/config/perl.m4,v 1.1 2001/08/26 22:28:04 petere Exp $
2+
3+
4+
# PGAC_PATH_PERL
5+
# --------------
6+
AC_DEFUN([PGAC_PATH_PERL],
7+
[AC_PATH_PROG(PERL, perl)])
8+
9+
10+
# PGAC_CHECK_PERL_DIRS
11+
# ---------------------
12+
AC_DEFUN([PGAC_CHECK_PERL_DIRS],
13+
[
14+
AC_REQUIRE([PGAC_PATH_PERL])
15+
AC_MSG_CHECKING([Perl installation directories])
16+
17+
# These are the ones we currently need. Others can be added easily.
18+
perl_installsitearch=`$PERL -MConfig -e 'print $Config{installsitearch}'`
19+
perl_installsitelib=`$PERL -MConfig -e 'print $Config{installsitelib}'`
20+
perl_installman3dir=`$PERL -MConfig -e 'print $Config{installman3dir}'`
21+
22+
AC_SUBST(perl_installsitearch)[]dnl
23+
AC_SUBST(perl_installsitelib)[]dnl
24+
AC_SUBST(perl_installman3dir)[]dnl
25+
26+
AC_MSG_RESULT(done)
27+
])

0 commit comments

Comments
 (0)