Browse Source

modernize flags

Ralf S. Engelschall 23 years ago
parent
commit
7326f527db
1 changed files with 11 additions and 11 deletions
  1. 11 11
      apache/apache.spec

+ 11 - 11
apache/apache.spec

@@ -423,9 +423,9 @@ AutoReqProv:  no
 %if "%{with_mod_php}" == "yes"
     ( cd php-%{V_mod_php}
       CC="%{l_cc}"; export CC
-      CFLAGS="%{l_cflags -O} -I%{l_prefix}/include"; export CFLAGS
-      CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include"; export CPPFLAGS
-      LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib"; export LDFLAGS
+      CFLAGS="%{l_cflags -O} %{l_cppflags}"; export CFLAGS
+      CPPFLAGS="%{l_cflags -O} %{l_cppflags}"; export CPPFLAGS
+      LDFLAGS="%{l_cflags -O} %{l_ldflags}"; export LDFLAGS
       LIBS=""; export LIBS
 %if "%{with_mod_ssl}" == "yes"
       CFLAGS="$CFLAGS -DEAPI"
@@ -569,12 +569,12 @@ AutoReqProv:  no
     ( cd php-%{V_mod_php3}
       CC="%{l_cc}" \
 %if "%{with_mod_ssl}" == "yes"
-      CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -DEAPI" \
+      CFLAGS="%{l_cflags -O} %{l_cppflags} -DEAPI" \
 %else
-      CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
+      CFLAGS="%{l_cflags -O} %{l_cppflags}" \
 %endif
-      CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
-      LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib" \
+      CPPFLAGS="%{l_cflags -O} %{l_cppflags}" \
+      LDFLAGS="%{l_cflags -O} %{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --with-apache=../apache_%{V_apache} \
@@ -712,13 +712,13 @@ AutoReqProv:  no
       libs="$libs -lpam"
 %endif
 %if "%{with_mod_auth_ldap}" == "yes"
-      cflags="$cflags -I%{l_prefix}/include"
-      ldflags="$ldflags -L%{l_prefix}/lib"
+      cflags="$cflags %{l_cppflags}"
+      ldflags="$ldflags %{l_ldflags}"
       libs="$libs -lldap -llber -lssl -lcrypto"
 %endif
 %if "%{with_gdbm_ndbm}" == "yes"
-      cflags="$cflags -I%{l_prefix}/include"
-      ldflags="$ldflags -L%{l_prefix}/lib"
+      cflags="$cflags %{l_cppflags}"
+      ldflags="$ldflags %{l_ldflags}"
       libs="$libs -lndbm -lgdbm"
 %endif
       CC="%{l_cc}" \