Commit07d35e4

committed

Change alternate database location patch to test for symlink() rather

than WIN32.

1 parent6165a27 commit07d35e4Copy full SHA for 07d35e4

File tree

+12

-8

lines changed

+12

-8

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3577,7 +3577,7 @@ else`
`3577`	`3577`	`then`
`3578`	`3578`	`echo'%%'> conftest.l`
`3579`	`3579`	`if$pgac_candidate -t conftest.l2>/dev/null\| grep FLEX_SCANNER>/dev/null2>&1;then`
`3580`		`-if$pgac_candidate --version\| grep'2\.5\.3$'>/dev/null2>&1;then`
	`3580`	`+if$pgac_candidate --version\| grep'2\.5\.3$'>/dev/null2>&1;then`
`3581`	`3581`	`pgac_broken_flex=$pgac_candidate`
`3582`	`3582`	`continue`
`3583`	`3583`	`fi`
`@@ -10305,7 +10305,8 @@ test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"`
`10305`	`10305`
`10306`	`10306`
`10307`	`10307`
`10308`		`-forac_funcin cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat setproctitle setsid sigprocmask sysconf utime utimes waitpid`
	`10308`	`+`
	`10309`	`+forac_funcin cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat setproctitle setsid sigprocmask symlink sysconf utime utimes waitpid`
`10309`	`10310`	`do`
`10310`	`10311`	as_ac_var=`echo"ac_cv_func_$ac_func"\|$as_tr_sh`
`10311`	`10312`	`echo"$as_me:$LINENO: checking for$ac_func">&5`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $Header: /cvsroot/pgsql/configure.in,v 1.244 2003/04/24 21:16:42 tgl Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.245 2003/05/07 03:47:08 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -779,7 +779,7 @@ PGAC_FUNC_GETTIMEOFDAY_1ARG`
`779`	`779`	`# SunOS doesn't handle negative byte comparisons properly with +/- return`
`780`	`780`	`AC_FUNC_MEMCMP`
`781`	`781`
`782`		`-AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat setproctitle setsid sigprocmask sysconf utime utimes waitpid])`
	`782`	`+AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat setproctitle setsid sigprocmasksymlinksysconf utime utimes waitpid])`
`783`	`783`
`784`	`784`	`AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])`
`785`	`785`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.113 2003/05/04 04:42:52 momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.114 2003/05/07 03:47:08 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -174,8 +174,8 @@ createdb(const CreatedbStmt *stmt)`
`174`	`174`	`/* don't call this in a transaction block */`
`175`	`175`	`PreventTransactionChain((void*)stmt,"CREATE DATABASE");`
`176`	`176`
`177`		`-#ifdefWIN32`
`178`		`-if (dbpath!=NULL)/* platform has no symlinks */`
	`177`	`+#ifndefHAVE_SYMLINK`
	`178`	`+if (dbpath!=NULL)`
`179`	`179`	`elog(ERROR,"CREATE DATABASE: may not use an alternate location on this platform");`
`180`	`180`	`#endif`
`181`	`181`
`@@ -301,7 +301,7 @@ createdb(const CreatedbStmt *stmt)`
`301`	`301`	`/* Make the symlink, if needed */`
`302`	`302`	`if (alt_loc)`
`303`	`303`	`{`
`304`		`-#ifndefWIN32/* already throws error on WIN32 above */`
	`304`	`+#ifdefHAVE_SYMLINK/* already throws error above */`
`305`	`305`	`if (symlink(alt_loc,nominal_loc)!=0)`
`306`	`306`	`#endif`
`307`	`307`	`elog(ERROR,"CREATE DATABASE: could not link '%s' to '%s': %m",`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,9 @@`
`414`	`414`	`/* Define to 1 if you have the <SupportDefs.h> header file. */`
`415`	`415`	`#undef HAVE_SUPPORTDEFS_H`
`416`	`416`
	`417`	+/* Define to 1 if you have the `symlink' function. */
	`418`	`+#undef HAVE_SYMLINK`
	`419`	`+`
`417`	`420`	/* Define to 1 if you have the `sysconf' function. */
`418`	`421`	`#undef HAVE_SYSCONF`
`419`	`422`

Comments

(0)