Attachment 770 Details for Bug 6262 – Данный патч содержит исправление ошибки

[patch] Данный патч содержит исправление ошибки

netams-configure.sh.patch (text/plain), 1.50 KB, created by Sergei Epiphanov on 2005-03-14 03:15:19 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Epiphanov

Created: 2005-03-14 03:15:19 MSK

Size: 1.50 KB

patch

obsolete

>--- configure.sh.orig	2004-12-18 03:26:52 +0300
>+++ configure.sh	2005-03-14 02:45:38 +0300
>@@ -9,7 +9,7 @@
> ##########################################################
> paths='/usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql4/lib/mysql
>  /usr/local/include/mysql /usr/local/include /usr/include /usr/include/mysql /usr/local/mysql4/include/mysql
>- /opt/csw/include /usr/pkg/include/mysql /usr/pkg/lib/mysql '
>+ /opt/csw/include /usr/pkg/include/mysql /usr/pkg/lib/mysql /usr/include/pgsql'
>  
> locate_file(){
> 	for val in $paths; do
>@@ -108,13 +108,13 @@
> 
> #paths
> echo "PATH_TO_ETC=/etc" >> $makefile
>-echo "PATH_TO_CONFIG=/etc/netams.cfg" >> $makefile
>-echo "PATH_TO_LOG=/var/log/netams.log" >> $makefile
>-echo "PATH_TO_SCRIPTS=/etc/init.d" >> $makefile
>-echo "DAEMONDIR=/usr/local/sbin"  >> $makefile
>+echo "PATH_TO_CONFIG=/etc/netams/netams.conf" >> $makefile
>+echo "PATH_TO_LOG=/var/log/netams/netams.log" >> $makefile
>+echo "PATH_TO_SCRIPTS=/etc/rc.d/init.d" >> $makefile
>+echo "DAEMONDIR=usr/sbin"  >> $makefile
> 
> #ipq
>-locate_file "libipq.a" && v1=$var && locate_file "libipq.h" && v2=$var
>+locate_file "libipq.so" && v1=$var && locate_file "libipq.h" && v2=$var
> if [ $v1 -a $v2 ]; then
> 	echo "Will have LIBIPQ support"
> 	ipv=`iptables -V`
>@@ -123,7 +123,7 @@
> 		echo "          LIBIPQ is <=1.2.4 (yours is .$ipvn)"
> 		echo "DEFINE += -DIPTBL_OLD" >> $makefile
> 	fi
>-	echo "LIB += -lipq -L$v1" >> $makefile
>+	echo "LIB += -lipq" >> $makefile
> else
> 	echo "DEFINE += -DIPTBL_NONE" >> $makefile
> fi

Actions: View | Diff

Attachments on bug 6262: 770