Author: glen Date: Sat Apr 29 10:56:28 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- enable all modules as dso is possible now
---- Files affected:
SPECS:
proftpd.spec (1.211.2.4 -> 1.211.2.5)
---- Diffs:
================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.4 SPECS/proftpd.spec:1.211.2.5
--- SPECS/proftpd.spec:1.211.2.4 Sat Apr 29 12:33:33 2006
+++ SPECS/proftpd.spec Sat Apr 29 12:56:23 2006
@@ -5,13 +5,13 @@
%bcond_without pam # disable PAM support
%bcond_without ipv6 # disable IPv6 and TCPD support
%bcond_without ssl # disbale TLS/SSL support
-%bcond_with ldap # enable LDAP support
-%bcond_with mysql # enable MySQL support
-%bcond_with pgsql # enable PostgreSQL support
-%bcond_with quotafile # enable quota file support
-%bcond_with quotaldap # enable quota ldap support
-%bcond_with quotamysql # enable quota mysql support
-%bcond_with quotapgsql # enable quota pgsql support
+%bcond_without ldap # enable LDAP support
+%bcond_without mysql # enable MySQL support
+%bcond_without pgsql # enable PostgreSQL support
+%bcond_without quotafile # enable quota file support
+%bcond_without quotaldap # enable quota ldap support
+%bcond_without quotamysql # enable quota mysql support
+%bcond_without quotapgsql # enable quota pgsql support
%bcond_without dso # enable DSO (available since 1.3.0)
%bcond_with linuxprivs # enable libcap support
@@ -184,11 +184,6 @@
standalone.
%prep
-%if %{with mysql} && %{with pgsql}
-echo "Error: You can't build at once --with mysql and --with pgsql"
-exit 1
-%endif
-
%setup -q -a 8 -n %{name}-%{version}%{?_rc}
#%patch0 -p1
#%patch1 -p1
@@ -205,8 +200,8 @@
cp -f /usr/share/automake/config.sub .
%{__autoconf}
#RUN_DIR=%{_localstatedir} ; export RUN_DIR
-#CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses
%{?with_mysql:-I%{_includedir}/mysql}"
-#CPPFLAGS="%{rpmcflags} -I%{_includedir}/ncurses
%{?with_mysql:-I%{_includedir}/mysql}"
+CFLAGS="%{rpmcflags} %{?with_mysql:-I%{_includedir}/mysql}"
+CPPFLAGS="%{rpmcflags} %{?with_mysql:-I%{_includedir}/mysql}"
MODULES="
mod_ratio
@@ -224,8 +219,7 @@
%{?with_mysql:mod_sql mod_sql_mysql}
%{?with_pgsql:mod_sql mod_sql_postgres}
"
-
-MODARG=$(echo $MODULES | xargs | tr ' ' ':')
+MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
%configure \
--enable-autoshadow \
@@ -420,6 +414,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.211.2.5 2006/04/29 10:56:23 glen
+- enable all modules as dso is possible now
+
Revision 1.211.2.4 2006/04/29 10:33:33 glen
- builds. not tested
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.211.2.4&r2=1.211.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
