From b0f94ba49ce6eb928e72c776796ae97a4442cb9b Mon Sep 17 00:00:00 2001 From: psychon Date: Wed, 25 Feb 2009 16:35:50 +0000 Subject: [PATCH] configure: Add the module path defines as late as possible In some (weird?) cases these flags could make the libperl and libsasl2 checks fail. Thanks to darix for reporting this. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1400 726aef4b-f618-498e-8847-2d620e286838 --- configure | 6 +++--- configure.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0928ae3e..f7a332f9 100755 --- a/configure +++ b/configure @@ -3082,9 +3082,6 @@ echo "$as_me: error: could not find dlopen. Try --disable-modules" >&2;} # (dynamic_lookup might only work on 10.4 and later) fi - appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\"" - appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\"" - if test -z "$NOPERL"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 @@ -3274,6 +3271,9 @@ echo "$as_me: error: could not find libsasl2. Try --disable-sasl." >&2;} fi fi + + appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\"" + appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\"" fi VERSION=0.067 diff --git a/configure.in b/configure.in index 28414684..474e21e2 100644 --- a/configure.in +++ b/configure.in @@ -198,9 +198,6 @@ if test "$MODULES" = "yes"; then # (dynamic_lookup might only work on 10.4 and later) fi - appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\"" - appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\"" - if test -z "$NOPERL"; then AC_PATH_PROG([PERL], [perl], []) if test -n "$PERL"; then @@ -217,6 +214,9 @@ if test "$MODULES" = "yes"; then [: Dont let autoconf add -lsasl2, Makefile handles that], AC_MSG_ERROR([could not find libsasl2. Try --disable-sasl.])) fi + + appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\"" + appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\"" fi VERSION=AC_PACKAGE_VERSION