upgrade DLZ 0.40 -> 0.50 with ODBC support, fix dlz_postgres linking

bind/bind.spec

@@ -25,7 +25,7 @@
 
 #   package versions
 %define       V_bind 9.2.2
-%define       V_dlz  0.4.3
+%define       V_dlz  0.5.0
 
 #   package information
 Name:         bind
@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        DNS
 License:      ISC
 Version:      %{V_bind}
-Release:      20030503
+Release:      20030606
 
 #   package options
 %option       with_dlz_mysql      no
@@ -45,9 +45,10 @@ Release:      20030503
 %option       with_dlz_filesystem no
 %option       with_dlz_stub       no
 %option       with_dlz_bdb        no
+%option       with_dlz_odbc       no
 
 #   aggregate option
-%if "%{with_dlz_mysql}" == "yes" || "%{with_dlz_postgres}" == "yes" || "%{with_dlz_filesystem}" == "yes" || "%{with_dlz_stub}" == "yes" || "%{with_dlz_bdb}" == "yes"
+%if "%{with_dlz_mysql}" == "yes" || "%{with_dlz_postgres}" == "yes" || "%{with_dlz_filesystem}" == "yes" || "%{with_dlz_stub}" == "yes" || "%{with_dlz_bdb}" == "yes" || "%{with_dlz_odbc}" == "yes"
 %define       with_dlz            yes
 %else
 %define       with_dlz            no
@@ -82,6 +83,10 @@ PreReq:       postgresql
 BuildPreReq:  db
 PreReq:       db
 %endif
+%if "%{with_dlz_odbc}" == "yes"
+BuildPreReq:  unixodbc
+PreReq:       unixodbc
+%endif
 AutoReq:      no
 AutoReqProv:  no
 Conflicts:    bind8
@@ -96,26 +101,21 @@ Conflicts:    bind8
 %prep
     %setup -q
 %if "%{with_dlz}" == "yes"
-    echo "WITH DLZ"
     %setup -q -T -D -a 10
     #
     %{l_patch} -p1 <dlz.patch
     #
-    #   fix up DLZ link libraries for MYSQL
+    #   fix up DLZ link libraries for MYSQL and Postgres
     %{l_shtool} subst \
         -e '/-lmysqlclient/s;-l\(nsl\|z\|crypt\|m\)\( \|"\);\2;g' \
+        -e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
         configure
 %endif
-%if "%{with_dlz_bdb}" != "yes"
-    #   dlzbdb still doesn't link if not enabled
-    %{l_shtool} subst \
-        -e 's;dlzbdb *;;g' \
-        bin/Makefile.in
-%endif
 
 %build
     cf=""
     lf=""
+    li=""
 %if "%{with_dlz_mysql}" == "yes"
     cf=`mysql_config --cflags`
     cf=`eval echo $cf`
@@ -153,6 +153,11 @@ Conflicts:    bind8
         --with-dlz-stub=yes \
 %else
         --with-dlz-stub=no \
+%endif
+%if "%{with_dlz_odbc}" == "yes"
+        --with-dlz-odbc="%{l_prefix}" \
+%else
+        --with-dlz-odbc=no \
 %endif
         --with-openssl=%{l_prefix} \
         --with-libtool \