Skip to content

Commit cd3a8e2

Browse files
scrappyscrappy
committed
change configure so that if postgresql isn't being installed as root, do not configure in the perl5 interface. the perl5 interface needs to be installed under /usr/local/lib/perl5/*, which is generally owned by root. This allows a non-root build/install with the only root requirement being the make/install of hte perl5 stuff...
1 parent 8c586b2 commit cd3a8e2

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎src/backend/parser/gram.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
*
230230
*
231231
* IDENTIFICATION
232-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.44 1998/10/09 21:28:42 momjian Exp $
232+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.45 1998/10/13 17:26:41 scrappy Exp $
233233
*
234234
* HISTORY
235235
* AUTHOR DATE MAJOR EVENT
@@ -4450,7 +4450,7 @@ static const short yycheck[] = { 3,
44504450
-1, -1, -1, -1, -1, -1, -1, -1, 204
44514451
};
44524452
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
4453-
#line 3 "/usr/local/bison/bison.simple"
4453+
#line 3 "/usr/local/share/bison.simple"
44544454

44554455
/* Skeleton output parser for bison,
44564456
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -4643,7 +4643,7 @@ __yy_memcpy (char *to, char *from, int count)
46434643
#endif
46444644
#endif
46454645

4646-
#line 196 "/usr/local/bison/bison.simple"
4646+
#line 196 "/usr/local/share/bison.simple"
46474647

46484648
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
46494649
into yyparse. The argument should have type void *.
@@ -10398,7 +10398,7 @@ case 929:
1039810398
break;}
1039910399
}
1040010400
/* the action file gets copied in in place of this dollarsign */
10401-
#line 498 "/usr/local/bison/bison.simple"
10401+
#line 498 "/usr/local/share/bison.simple"
1040210402

1040310403
yyvsp -= yylen;
1040410404
yyssp -= yylen;

‎src/backend/parser/scan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* A lexical scanner generated by flex */
22

33
/* Scanner skeleton version:
4-
* /master/usr.bin/lex/skel.c,v 1.3 1997/09/25 00:10:23 jch Exp
4+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.31 1998/10/13 17:26:50 scrappy Exp $
55
*/
66

77
#define FLEX_SCANNER
@@ -556,7 +556,7 @@ char *yytext;
556556
*
557557
*
558558
* IDENTIFICATION
559-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.30 1998/10/09 03:07:54 momjian Exp $
559+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.31 1998/10/13 17:26:50 scrappy Exp $
560560
*
561561
*-------------------------------------------------------------------------
562562
*/

‎src/configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -889,8 +889,8 @@ if test "${with_perl+set}" = set; then
889889
withval="$with_perl"
890890

891891
case "$withval" in
892-
y | ye | yes) USE_PERL=true; echo "$ac_t""enabled" 1>&6 ;;
893-
*) USE_PERL=false; echo "$ac_t""disabled" 1>&6 ;;
892+
y | ye | yes) USE_PERL=true; echo "$ac_t""enabled" 1>&6 ;;
893+
*) USE_PERL=false; echo "$ac_t""disabled" 1>&6 ;;
894894
esac
895895

896896
else
@@ -901,13 +901,13 @@ fi
901901

902902
#dnl Verify that postgres is already installed
903903
#dnl per instructions for perl interface installation
904-
#if test "$USE_PERL" = "true"
905-
#then
906-
# if test ! -x "$prefix"/bin/postgres -a ! -x "$ac_default_prefix"/bin/postgres
907-
# then AC_MSG_WARN(perl support disabled; postgres not previously installed)
908-
# USE_PERL=
909-
# fi
910-
#fi
904+
if test "$USE_PERL" = "true"
905+
then
906+
if test "$WHOAMI" != "root"
907+
then echo "configure: warning: perl support disabled; must be root to install" 1>&2
908+
USE_PERL=
909+
fi
910+
fi
911911
export USE_PERL
912912

913913
echo $ac_n "checking setting USE_ODBC""... $ac_c" 1>&6

‎src/configure.in

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -259,22 +259,22 @@ AC_ARG_WITH(
259259
[ --with-perl use perl ],
260260
[
261261
case "$withval" in
262-
y | ye | yes) USE_PERL=true; AC_MSG_RESULT(enabled) ;;
263-
*) USE_PERL=false; AC_MSG_RESULT(disabled) ;;
262+
y | ye | yes) USE_PERL=true; AC_MSG_RESULT(enabled) ;;
263+
*) USE_PERL=false; AC_MSG_RESULT(disabled) ;;
264264
esac
265265
],
266266
[ USE_PERL=false; AC_MSG_RESULT(disabled) ]
267267
)
268268

269269
#dnl Verify that postgres is already installed
270270
#dnl per instructions for perl interface installation
271-
#if test "$USE_PERL" = "true"
272-
#then
273-
# if test ! -x "$prefix"/bin/postgres -a ! -x "$ac_default_prefix"/bin/postgres
274-
# then AC_MSG_WARN(perl support disabled; postgres not previously installed)
275-
# USE_PERL=
276-
# fi
277-
#fi
271+
if test "$USE_PERL" = "true"
272+
then
273+
if test "$WHOAMI" != "root"
274+
then AC_MSG_WARN(perl support disabled; must be root to install)
275+
USE_PERL=
276+
fi
277+
fi
278278
export USE_PERL
279279

280280
dnl We include odbc support unless we disable it with --with-odbc=false

0 commit comments

Comments
 (0)