From: Michael Adam Date: Tue, 19 Feb 2008 15:24:24 +0000 (+0100) Subject: configure: move AC_SUBST's of certain directories to the corresponding checks. X-Git-Tag: samba-3.2.0pre2~37^2~160^2~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28c862704c27aaffc858650d0a4f4cc7893bb406;p=thirdparty%2Fsamba.git configure: move AC_SUBST's of certain directories to the corresponding checks. Michael --- diff --git a/source/configure.in b/source/configure.in index a595ebb83ec..2c7ebdd8e6e 100644 --- a/source/configure.in +++ b/source/configure.in @@ -252,6 +252,21 @@ AC_ARG_WITH(mandir, ;; esac]) +AC_SUBST(configdir) +AC_SUBST(lockdir) +AC_SUBST(piddir) +AC_SUBST(logfilebase) +AC_SUBST(ctdbdir) +AC_SUBST(privatedir) +AC_SUBST(swatdir) +AC_SUBST(bindir) +AC_SUBST(sbindir) +AC_SUBST(codepagedir) +AC_SUBST(statedir) +AC_SUBST(cachedir) +AC_SUBST(rootsbindir) +AC_SUBST(pammodulesdir) + AC_ARG_WITH(cfenc, [AS_HELP_STRING([--with-cfenc=HEADERDIR], [Use internal CoreFoundation encoding API for optimization (Mac OS X/Darwin only)])], [ @@ -310,21 +325,6 @@ if test "x${srcdir-.}" != "x."; then SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"` fi -AC_SUBST(configdir) -AC_SUBST(lockdir) -AC_SUBST(piddir) -AC_SUBST(logfilebase) -AC_SUBST(ctdbdir) -AC_SUBST(privatedir) -AC_SUBST(swatdir) -AC_SUBST(bindir) -AC_SUBST(sbindir) -AC_SUBST(codepagedir) -AC_SUBST(statedir) -AC_SUBST(cachedir) -AC_SUBST(rootsbindir) -AC_SUBST(pammodulesdir) - dnl Unique-to-Samba variables we'll be playing with. AC_SUBST(SAMBA_CPPFLAGS) AC_SUBST(SHELL)