OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jan-2007 15:10:33
Branch: HEAD Handle: 2007013014103300
Modified files:
openpkg-src/apache apache.spec
Log:
build time fix MS SQL-support
Summary:
Revision Changes Path
1.372 +6 -10 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.371 -r1.372 apache.spec
--- openpkg-src/apache/apache.spec 20 Jan 2007 23:15:44 -0000 1.371
+++ openpkg-src/apache/apache.spec 30 Jan 2007 14:10:33 -0000 1.372
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070121
+Release: 20070130
# package options (suexec related)
%option with_suexec yes
@@ -572,14 +572,8 @@
ext/gd/config.m4
%if "%{with_mod_php_mssql}" == "yes"
%{l_shtool} subst \
- -e 's;\($PHP_MSSQL/include/\)\(tds.h\);\1freetds/\2;g' \
- -e
's;\($FREETDS_INSTALLATION_DIR/lib/\)\(libtds.a\);\1freetds/\2;g' \
- -e
's;\(MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include\);\1/freetds;' \
- -e 's;\(MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib\);\1/freetds;' \
+ -e
's;\($FREETDS_INSTALLATION_DIR/\)$PHP_LIBDIR/\(libtds.a\);\1/lib/freetds/\2;g' \
configure
- %{l_shtool} subst \
- -e 's;^typedef short SHORT\;;;' \
- ext/mssql/php_mssql.h
%endif
) || exit $?
%endif
@@ -792,7 +786,6 @@
%endif
%if "%{with_mod_php_mssql}" == "yes"
--with-mssql=%{l_prefix} \
- --with-pdo-mysql=%{l_prefix} \
%else
--without-mssql \
%endif
@@ -1159,7 +1152,10 @@
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_mod_php_oci8}" == "yes"
+%if "%{with_mod_php}" == "yes" && "%{with_mod_php_mssql}" == "yes"
+ ldflags="$ldflags %{l_ldflags freetds}"
+%endif
+%if "%{with_mod_php}" == "yes" && "%{with_mod_php_oci8}" == "yes"
# workaround Oracle inter-library depencency by explicitly
# linking in all libraries
ldflags="$ldflags `%{l_rc} --query oracle_ldflags`"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
