rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 00:41:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Transmit -I switches selected by configure (particularly those from

Browse Source 
--with-includes) to makefiles for pltcl and plperl, so that these
switches will be used even though we do not want other top-level
CFLAGS.  Ain't it fun trying to support multiple-compiler platforms?
This commit is contained in:
Tom Lane 2000-05-23 02:12:46 +00:00
parent aca5b34427
commit ac6637485b
5 changed files with 409 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.global.in
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.70 2000/04/14 23:43:41 petere Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.71 2000/05/23 02:12:46 tgl Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
@ -210,6 +210,7 @@ LEX= @LEX@
AROPT= @AROPT@ AROPT= @AROPT@
CFLAGS= -I$(SRCDIR)/include -I$(SRCDIR)/backend @CPPFLAGS@ @CFLAGS@ CFLAGS= -I$(SRCDIR)/include -I$(SRCDIR)/backend @CPPFLAGS@ @CFLAGS@
CFLAGS_SL= @SHARED_LIB@ CFLAGS_SL= @SHARED_LIB@
PGSQL_INCLUDES= @PGSQL_INCLUDES@
LIBS= @LIBS@ LIBS= @LIBS@
LDFLAGS= @LDFLAGS@ $(LIBS) LDFLAGS= @LDFLAGS@ $(LIBS)
LDREL= -r LDREL= -r

798
src/configure vendored
View File

File diff suppressed because it is too large Load Diff

5
src/configure.in
View File

@ -168,7 +168,7 @@ dnl Each can name one or more directories.
if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
for dir in $INCLUDE_DIRS $SRCH_INC; do for dir in $INCLUDE_DIRS $SRCH_INC; do
if test -d "$dir"; then if test -d "$dir"; then
PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$dir" PGSQL_INCLUDES="$PGSQL_INCLUDES -I$dir"
else else
AC_MSG_WARN([*** Include directory $dir does not exist.]) AC_MSG_WARN([*** Include directory $dir does not exist.])
fi fi
@ -427,7 +427,7 @@ else
fi fi
AC_SUBST(CC_VERSION) AC_SUBST(CC_VERSION)
CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS" CPPFLAGS="$CPPFLAGS $PGSQL_INCLUDES"
echo "- setting CPPFLAGS=$CPPFLAGS" echo "- setting CPPFLAGS=$CPPFLAGS"
LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
@ -476,6 +476,7 @@ AC_SUBST(CPU)
AC_SUBST(SRCDIR) AC_SUBST(SRCDIR)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(PGSQL_INCLUDES)
AC_SUBST(AROPT) AC_SUBST(AROPT)
AC_SUBST(SHARED_LIB) AC_SUBST(SHARED_LIB)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)

2
src/pl/plperl/Makefile.PL
View File

@ -54,7 +54,7 @@ my $perllib = "-L$Config{archlibexp}/CORE -lperl";
WriteMakefile( 'NAME' => 'plperl', WriteMakefile( 'NAME' => 'plperl',
dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } , dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } ,
INC => '-I$(SRCDIR)/include -I$(SRCDIR)/backend', INC => '-I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)',
XS => { 'SPI.xs' => 'SPI.c' }, XS => { 'SPI.xs' => 'SPI.c' },
OBJECT => 'plperl.o eloglvl.o SPI.o', OBJECT => 'plperl.o eloglvl.o SPI.o',
); );

6
src/pl/tcl/Makefile
View File

@ -4,7 +4,7 @@
# Makefile for the pltcl shared object # Makefile for the pltcl shared object
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.13 2000/05/22 23:56:44 momjian Exp $ # $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.14 2000/05/23 02:12:44 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -66,11 +66,11 @@ CC = $(TCL_CC)
# Instead use TCL's CFLAGS plus necessary -I directives. # Instead use TCL's CFLAGS plus necessary -I directives.
# Can choose either TCL_CFLAGS_OPTIMIZE or TCL_CFLAGS_DEBUG here, as needed # Can choose either TCL_CFLAGS_OPTIMIZE or TCL_CFLAGS_DEBUG here, as needed
CFLAGS+= $(TCL_CFLAGS_OPTIMIZE) CFLAGS= $(TCL_CFLAGS_OPTIMIZE)
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS) CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
# #
# Uncomment the following to enable the unknown command lookup # Uncomment the following to enable the unknown command lookup