diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-07-28 11:51:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:30:09 -0500 |
| commit | 930e624d816a175d5ca4448e6ed40bc7dd8ec5b7 (patch) | |
| tree | cefd60a954d828902c8fde6a6e8a69954e0baa63 /source4/build/m4/check_path.m4 | |
| parent | d0496a4ee626f829f1b5032122d2daf53e0bd2e2 (diff) | |
| download | samba-930e624d816a175d5ca4448e6ed40bc7dd8ec5b7.tar.gz samba-930e624d816a175d5ca4448e6ed40bc7dd8ec5b7.tar.bz2 samba-930e624d816a175d5ca4448e6ed40bc7dd8ec5b7.zip | |
r8826: Make configure generate config.mk files (with the external libraries
that were found) and a config.pm file (with all substitution variables)
(This used to be commit 52bb1374bbcfc9b9a6d098687bafe9021a1ee858)
Diffstat (limited to 'source4/build/m4/check_path.m4')
| -rw-r--r-- | source4/build/m4/check_path.m4 | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index a6e9ab258d..55f04dee9a 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -14,16 +14,16 @@ AC_PREFIX_DEFAULT(/usr/local/samba) AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], configdir="${sysconfdir}/samba" - lockdir="\${VARDIR}/cache/samba" - piddir="\${VARDIR}/run/samba" - logfilebase="\${VARDIR}/log/samba" + lockdir="\${localstatedir}/cache/samba" + piddir="\${localstatedir}/run/samba" + logfilebase="\${localstatedir}/log/samba" privatedir="\${CONFIGDIR}/private" libdir="\${prefix}/lib/samba" swatdir="\${DATADIR}/samba/swat", - configdir="\${LIBDIR}" - logfilebase="\${VARDIR}" - lockdir="\${VARDIR}/locks" - piddir="\${VARDIR}/locks" + configdir="\${libdir}" + logfilebase="\${localstatedir}" + lockdir="\${localstatedir}/locks" + piddir="\${localstatedir}/locks" privatedir="\${prefix}/private" swatdir="\${prefix}/swat") @@ -152,8 +152,6 @@ AC_ARG_ENABLE(developer, [ --enable-developer Turn on developer warnings a CFLAGS="${CFLAGS} -g -Wall" developer=yes DEVELOPER_CFLAGS="-Wshadow -Werror-implicit-function-declaration -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wdeclaration-after-statement -Wmissing-format-attribute -Wformat=2 -Wno-format-y2k -DDEBUG_PASSWORD -DDEVELOPER" - SMB_INFO_BUILD_ENV="$SMB_INFO_BUILD_ENV - \$SETTINGS{DEVELOPER} = \"YES\";" fi]) debug=no |