diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-04-15 20:12:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:21 -0500 |
| commit | 2f1aafa2a7e36298cc1e0e593b30fac1ab278596 (patch) | |
| tree | 80803c500daca5d859afeea4917f859a71d577a5 /source3/lib/replace/samba.m4 | |
| parent | 3e819bd22c199f9cdf68c0f6258b4be17674a129 (diff) | |
| download | samba-2f1aafa2a7e36298cc1e0e593b30fac1ab278596.tar.gz samba-2f1aafa2a7e36298cc1e0e593b30fac1ab278596.tar.bz2 samba-2f1aafa2a7e36298cc1e0e593b30fac1ab278596.zip | |
r22221: merge from samba4:
- libreplace unsetenv() and strptime() replacements
metze
(This used to be commit 057c1c04d09b48c713ebc0b334cabcefc02561e9)
Diffstat (limited to 'source3/lib/replace/samba.m4')
| -rw-r--r-- | source3/lib/replace/samba.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/lib/replace/samba.m4 b/source3/lib/replace/samba.m4 index 3769c7f50e..a2e04f53b1 100644 --- a/source3/lib/replace/samba.m4 +++ b/source3/lib/replace/samba.m4 @@ -3,8 +3,16 @@ AC_LIBREPLACE_BROKEN_CHECKS SMB_EXT_LIB(LIBREPLACE_EXT, [${LIBDL}]) SMB_ENABLE(LIBREPLACE_EXT) +# remove leading ./ LIBREPLACE_DIR=`echo ${libreplacedir} |sed -e 's/^\.\///g'` +# remove leading srcdir .. we are looking for the relative +# path within the samba source tree or wherever libreplace is. +# We need to make sure the object is not forced to end up in +# the source directory because we might be using a separate +# build directory. +LIBREPLACE_DIR=`echo ${LIBREPLACE_DIR} | sed -e "s|^$srcdir/||g"` + LIBREPLACE_OBJS="" for obj in ${LIBREPLACEOBJ}; do LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}" |