From f90e4617db9980594d80e44f58ab7b0c50e1e1b2 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 21 Mar 2007 13:49:03 +0000 Subject: [PATCH] * changed clearsilver to use pkgprefix for exporting right apache CFLAGS, CPPFLAGS and LDFLAGS and some cleanups of trailing spaces git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20526 10447126-35f2-4685-b0cf-6dd780d3921f --- develop/clearsilver/clearsilver.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/develop/clearsilver/clearsilver.conf b/develop/clearsilver/clearsilver.conf index 20cc13f27..3c834ffd7 100644 --- a/develop/clearsilver/clearsilver.conf +++ b/develop/clearsilver/clearsilver.conf @@ -14,15 +14,16 @@ # --- SDE-COPYRIGHT-NOTE-END --- # permanently disabling ruby beacause of compile errors -# disabling java and csharp module (mono support not testet till now) -var_append extraconfopt " " "--disable-ruby --disable-java --disable-csharp" +# disabling java and csharp module (mono support not testet till now) +var_append extraconfopt " " "--disable-ruby --disable-java --disable-csharp" # correcting apache path if pkginstalled apache; then - var_append extraconfopt ' ' "--with-apache=$SDECFG_PKG_APACHE_PREFIX" - var_append CFLAGS ' ' "-I/$SDECFG_PKG_APACHE_PREFIX/include" - var_append CPPFLAGS ' ' "-I/$SDECFG_PKG_APACHE_PREFIX/include" - var_append LDFLAGS ' ' "-L/$SDECFG_PKG_APACHE_PREFIX/lib" + pkgprefix -t apache + var_append extraconfopt ' ' "--with-apache=$root/$( pkgprefix apache )" + var_append CFLAGS ' ' "-I$root$( pkgprefix includedir apache )" + var_append CPPFLAGS ' ' "-I$root$( pkgprefix includedir apache )" + var_append LDFLAGS ' ' "-L$root$( pkgprefix libdir apache )" export CPPFLAGS CFLAGS LDFLAGS fi @@ -35,7 +36,7 @@ else var_append extraconfopt " " "--disable-compression" fi -# perl module +# perl module if pkginstalled perl; then var_append extraconfopt " " "--enable-perl" else @@ -46,14 +47,13 @@ fi if pkginstalled python; then pkgprefix -t python PYVER=$( pkgprefix ver python | cut -d'.' -f1,2 ) - var_append extraconfopt " " "--enable-python" + var_append extraconfopt " " "--enable-python" var_append extraconfopt " " "--with-python=/usr/bin/python$PYVER" else var_append extraconfopt " " "--disable-python" fi -# gettext +# gettext if pkginstalled gettext; then var_append extraconfopt " " "--enable-gettext" fi -