Replace explicit fsl usage with new l_fsl_ macros and correct hacky configure script

arpd/arpd.spec

@@ -36,7 +36,10 @@ Distribution: OpenPKG [EVAL]
 Group:        Network
 License:      GNU
 Version:      0.2
-Release:      20030314
+Release:      20030415
+
+#   package options
+%option       with_fsl yes
 
 #   list of sources
 Source0:      http://www.citi.umich.edu/u/provos/honeyd/arpd-%{version}.tar.gz
@@ -45,8 +48,12 @@ Source1:      rc.arpd
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030310, fsl, gcc, libdnet, libpcap, libevent
+BuildPreReq:  OpenPKG, openpkg >= 20030415, gcc, libdnet, libpcap, libevent
-PreReq:       OpenPKG, openpkg >= 20030310, fsl
+PreReq:       OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -62,6 +69,10 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n arpd
+    %{l_shtool} subst \
+        -e 's;LIBS=$DNETLIB;LIBS="$LIBS $DNETLIB";' \
+        -e 's;CFLAGS=$DNETINC;CFLAGS="$CFLAGS $DNETINC";' \
+        configure
 
 %build
     %{l_shtool} subst \
@@ -70,8 +81,8 @@ AutoReqProv:  no
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
-    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
+    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
-    LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+    LIBS="%{l_fsl_libs}" \
     ./configure \
         --prefix=%{l_prefix} \
         --with-libdnet=%{l_prefix} \