aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-07-09 13:14:19 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-07-09 13:14:19 +0000
commit74618e2b82b5158adf42caf64af70cbd7c699c6c (patch)
treef4782dc597569b1e2feb6ac50cad217dc39f35ee /src/include
parentb59c03f84206ed3f3f864dcbe337ec04b2a8558d (diff)
downloadpostgresql-74618e2b82b5158adf42caf64af70cbd7c699c6c.tar.gz
postgresql-74618e2b82b5158adf42caf64af70cbd7c699c6c.zip
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.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/config.h.in6
-rw-r--r--src/include/miscadmin.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 2c2f5e4482c..25e8be291ff 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure.
*
- * $Id: config.h.in,v 1.123 2000/07/05 17:44:29 scrappy Exp $
+ * $Id: config.h.in,v 1.124 2000/07/09 13:14:13 petere Exp $
*/
#ifndef CONFIG_H
@@ -58,8 +58,8 @@
/* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */
#undef PG_KRB_SRVNAM
-/* Location of the Kerberos server's keytab file (--with-krb-srvtab=FILE) */
-#undef PG_KRB_SRVTAB
+/* Define to build with (Open)SSL support (--with-openssl[=DIR]) */
+#undef USE_SSL
/*
* DEF_PGPORT is the TCP port number on which the Postmaster listens and
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 59269216ea7..7bc96c9f76f 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.62 2000/07/02 15:21:18 petere Exp $
+ * $Id: miscadmin.h,v 1.63 2000/07/09 13:14:13 petere Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -133,7 +133,7 @@ extern char *getpgusername(void);
extern void SetPgUserName(void);
extern int GetUserId(void);
extern void SetUserId(void);
-extern int FindExec(char *backend, char *argv0, char *binary_name);
+extern int FindExec(char *full_path, const char *argv0, const char *binary_name);
extern int CheckPathAccess(char *path, char *name, int open_mode);
/* lower case version for case-insensitive SQL referenced in pg_proc.h */