Mercurial Mercurial > sustaining > oi_151a > oi-build / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/samba3oi/patches/libreplace-m4.patch
author Gordon Ross <gwr@nexenta.com>
Tue, 14 Jun 2011 13:59:11 -0400
changeset 212 705e1ace097b
permissions -rw-r--r--
Add samba 3.5.8 configured for OpenIndiana
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
212
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     1
 
--- lib/replace/libreplace.m4.~1~	Sun Mar  6 13:48:05 2011
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     2
 
+++ lib/replace/libreplace.m4	Fri Jun  3 18:11:29 2011
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     3
 
@@ -5,9 +5,9 @@
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     4
 
 dnl find the libreplace sources. This is meant to work both for
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     5
 
 dnl libreplace standalone builds, and builds of packages using libreplace
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     6
 
 libreplacedir=""
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     7
 
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     8
 
+libreplacepaths=". lib/replace libreplace ../libreplace ../replace ../lib/replace ../../lib/replace ../../../lib/replace"
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
     9
 
 for d in $libreplacepaths; do
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    10
 
-	if test -f "$d/replace.c"; then
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    11
 
+	if test -f "$srcdir/$d/replace.c"; then
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    12
 
 		libreplacedir="$d"
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    13
 
 		AC_SUBST(libreplacedir)
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    14
 
 		break;
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    15
 
@@ -34,9 +34,9 @@
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    16
 
 dnl find the libreplace sources. This is meant to work both for
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    17
 
 dnl libreplace standalone builds, and builds of packages using libreplace
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    18
 
 libreplacedir=""
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    19
 
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    20
 
+libreplacepaths=". lib/replace libreplace ../libreplace ../replace ../lib/replace ../../lib/replace ../../../lib/replace"
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    21
 
 for d in $libreplacepaths; do
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    22
 
-	if test -f "$d/replace.c"; then
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    23
 
+	if test -f "$srcdir/$d/replace.c"; then
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    24
 
 		libreplacedir="$d"
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    25
 
 		AC_SUBST(libreplacedir)
705e1ace097b Add samba 3.5.8 configured for OpenIndiana
Gordon Ross <gwr@nexenta.com>
parents:
diff changeset 
    26
 
 		break;
sustaining/oi_151a/oi-build