Attachment 147607 Details for Bug 227754 – Proposed Fix

[patch] Proposed Fix

diffs.txt (text/plain), 3.61 KB, created by Nathan Kinder on 2007-02-07 22:24:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-02-07 22:24:49 UTC

Size: 3.61 KB

patch

obsolete

>Index: db.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
>retrieving revision 1.5
>diff -u -5 -t -r1.5 db.m4
>--- db.m4	6 Feb 2007 15:51:22 -0000	1.5
>+++ db.m4	7 Feb 2007 22:18:06 -0000
>@@ -1,7 +1,7 @@
> # BEGIN COPYRIGHT BLOCK
>-# Copyright (C) 2006 Red Hat, Inc.
>+# Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> #
> # This program is free software; you can redistribute it and/or
> # modify it under the terms of the GNU General Public License
> # as published by the Free Software Foundation; either version 2
>@@ -71,9 +71,12 @@
> db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'`
> dnl libname is libdb-maj.min e.g. libdb-4.2
> db_libver=${db_ver_maj}.${db_ver_min}
> dnl make sure the lib is available
> dnl use true so libdb won't be added to LIBS
>+save_ldflags="$LDFLAGS"
>+LDFLAGS="$db_lib"
> AC_CHECK_LIB([db-$db_libver], [db_create], [true],
>   [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])],
>   [$LIBNSL])
>+LDFLAGS="$save_ldflags"
> 
>Index: netsnmp.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/netsnmp.m4,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 netsnmp.m4
>--- netsnmp.m4	24 Oct 2006 21:11:02 -0000	1.2
>+++ netsnmp.m4	7 Feb 2007 22:18:06 -0000
>@@ -85,11 +85,10 @@
>   fi
> fi
> 
> dnl -  find dependent libs with net-snmp-config
> if test -n "$netsnmp_inc"; then
>-  AC_MSG_CHECKING(for netsnmp libs with net-snmp-config)
>   if test -x "$NETSNMPDIR/bin/net-snmp-config"; then
>     NETSNMP_CONFIG=$NETSNMPDIR/bin/net-snmp-config
>   else
>     AC_PATH_PROG(NETSNMP_CONFIG, net-snmp-config)
>   fi
>Index: svrcore.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/svrcore.m4,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 svrcore.m4
>--- svrcore.m4	12 Jan 2007 16:18:15 -0000	1.3
>+++ svrcore.m4	7 Feb 2007 22:18:06 -0000
>@@ -1,8 +1,28 @@
>-# -*- tab-width: 4; -*-
>+# BEGIN COPYRIGHT BLOCK
>+# Copyright (C) 2007 Red Hat, Inc.
>+# All rights reserved.
>+#
>+# This program is free software; you can redistribute it and/or
>+# modify it under the terms of the GNU General Public License
>+# as published by the Free Software Foundation; either version 2
>+# of the License, or (at your option) any later version.
>+#
>+# This program is distributed in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>+#
>+# END COPYRIGHT BLOCK
>+#
> # Configure paths for SVRCORE
>-# Public domain - Nathan Kinder <nkinder@redhat.com> 2006-06-26
>+
>+AC_CHECKING(for svrcore)
> 
> AC_MSG_CHECKING(for --with-svrcore)
> AC_ARG_WITH(svrcore,
>     [[  --with-svrcore[=PATH]   Use system installed svrcore - optional path for svrcore]],
>     dnl = Look in the standard system locations
>@@ -63,12 +83,12 @@
>     ],
>     AC_MSG_RESULT(no))
> 
> dnl svrcore not given - look for pkg-config
> if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
>-  AC_MSG_CHECKING(for svrcore with pkg-config)
>   AC_PATH_PROG(PKG_CONFIG, pkg-config)
>+  AC_MSG_CHECKING(for svrcore with pkg-config)
>   if test -n "$PKG_CONFIG"; then
>     if $PKG_CONFIG --exists svrcore; then
>       svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`
>       svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore`
>       AC_MSG_RESULT([using system svrcore])

Actions: View | Diff

Attachments on bug 227754: 147607 | 147612