Commitd0c1bbd

committed

Rename AC_PROG_LD* macros to PGAC_PROG_LD*. This avoids clashes with the

macros provided by the real libtool, when other packages borrow some macrosfrom PostgreSQL, as in the case of the ODBC driver.

1 parent7f72fd8 commitd0c1bbdCopy full SHA for d0c1bbd

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`
`29`	`29`	`# ... bunch of stuff removed here ...`
`30`	`30`
`31`		`-#AC_PROG_LD - find the path to the GNU or non-GNU linker`
`32`		`-AC_DEFUN([AC_PROG_LD],`
	`31`	`+#PGAC_PROG_LD - find the path to the GNU or non-GNU linker`
	`32`	`+AC_DEFUN([PGAC_PROG_LD],`
`33`	`33`	`[AC_ARG_WITH(gnu-ld,`
`34`	`34`	`[ --with-gnu-ld assume the C compiler uses GNU ld [[default=no]]],`
`35`	`35`	`test"$withval" = no\|\| with_gnu_ld=yes, with_gnu_ld=no)`
`@@ -102,10 +102,10 @@ else`
`102`	`102`	`AC_MSG_RESULT(no)`
`103`	`103`	`fi`
`104`	`104`	`test-z"$LD"&& AC_MSG_ERROR([no acceptable ld foundin\$PATH])`
`105`		`-AC_PROG_LD_GNU`
	`105`	`+PGAC_PROG_LD_GNU`
`106`	`106`	`])`
`107`	`107`
`108`		`-AC_DEFUN([AC_PROG_LD_GNU],`
	`108`	`+AC_DEFUN([PGAC_PROG_LD_GNU],`
`109`	`109`	`[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,`
`110`	`110`	`[# I'd rather use --version here, but apparently some GNU ld's only accept -v.`
`111`	`111`	`if$LD -v2>&1</dev/null\| egrep'(GNU\|with BFD)'1>&5;then`

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 $PostgreSQL: pgsql/configure.in,v 1.367 2004/07/14 17:55:09 petere Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.368 2004/07/17 18:53:56 petere Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -525,7 +525,7 @@ AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])`
`525`	`525`	`AC_PROG_AWK`
`526`	`526`	`PGAC_PATH_FLEX`
`527`	`527`	`AC_PROG_LN_S`
`528`		`-AC_PROG_LD`
	`528`	`+PGAC_PROG_LD`
`529`	`529`	`AC_SUBST(LD)`
`530`	`530`	`AC_SUBST(with_gnu_ld)`
`531`	`531`	`case $host_os in sysv5*)`

Comments

(0)