فهرست منبع

cleanup option processing

Ralf S. Engelschall 17 سال پیش
والد
کامیت
65e624c13c
1فایلهای تغییر یافته به همراه18 افزوده شده و 17 حذف شده
  1. 18 17
      freeradius/freeradius.spec

+ 18 - 17
freeradius/freeradius.spec

@@ -35,7 +35,7 @@ Class:        EVAL
 Group:        RADIUS
 License:      GPL
 Version:      2.0.5
-Release:      20080731
+Release:      20080801
 
 #   package options
 %option       with_mysql     no
@@ -124,13 +124,7 @@ AutoReqProv:  no
         --with-openssl-libraries=%{l_prefix}/lib/ \
 %if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes"
         --with-rlm_sql \
-        --without-rlm_sql_db2 \
-        --without-rlm_sql_firebird \
-        --without-rlm_sql_freetds \
-        --without-rlm_sql_iodbc \
-        --without-rlm_sql_oracle \
-        --without-rlm_sql_sybase \
-        --without-rlm_sql_unixodbc \
+        --with-rlm_sqlippool \
 %else
         --without-rlm_sql \
         --without-rlm_sqlippool \
@@ -140,21 +134,23 @@ AutoReqProv:  no
 %else
         --without-rlm_sql_mysql \
 %endif
-%if "%{with_openldap}" == "yes"
-        --with-rlm-ldap-include-dir=%{l_prefix}/include/ \
-        --with-rlm-ldap-lib-dir=%{l_prefix}/lib/ \
-%else
-        --without-rlm-ldap \
-%endif
 %if "%{with_pgsql}" == "yes"
         --with-rlm_sql_postgresql \
 %else
         --without-rlm_sql_postgresql \
 %endif
-%if "%{with_snmp}" == "yes"
-        --with-snmp \
+        --without-rlm_sql_db2 \
+        --without-rlm_sql_firebird \
+        --without-rlm_sql_freetds \
+        --without-rlm_sql_iodbc \
+        --without-rlm_sql_oracle \
+        --without-rlm_sql_sybase \
+        --without-rlm_sql_unixodbc \
+%if "%{with_openldap}" == "yes"
+        --with-rlm-ldap-include-dir=%{l_prefix}/include/ \
+        --with-rlm-ldap-lib-dir=%{l_prefix}/lib/ \
 %else
-        --without-snmp \
+        --without-rlm-ldap \
 %endif
         --without-rlm_eap_ikev2 \
         --without-rlm_eap_sim \
@@ -168,6 +164,11 @@ AutoReqProv:  no
         --without-rlm_pam \
         --without-rlm_perl \
         --without-rlm_python \
+%if "%{with_snmp}" == "yes"
+        --with-snmp \
+%else
+        --without-snmp \
+%endif
         --enable-strict-dependencies \
         --with-ltdl-lib=%{l_prefix}/lib \
         --with-ltdl-include=%{l_prefix}/include \