35 lines
1.9 KiB
Plaintext
35 lines
1.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.25 2012/01/25 13:26:05 ajacoutot Exp $
|
|
|
|
Don't do bash pattern substitutions.
|
|
|
|
Our libdb does not follow upstream naming (libdb.so.XX versus
|
|
libdb-5.0.so).
|
|
|
|
--- configure.orig Tue Jan 24 19:06:55 2012
|
|
+++ configure Wed Jan 25 12:34:57 2012
|
|
@@ -20171,9 +20171,9 @@ $as_echo_n "checking if gobject-introspection is corre
|
|
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
|
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
|
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
|
- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
|
|
+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e 's,$datadir,\$\(datadir\),g'`
|
|
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
|
- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
|
|
+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e 's,$libdir,\$\($libdir\),g'`
|
|
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
|
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
|
INTROSPECTION_MAKEFILE=$introspection_makefile
|
|
@@ -21061,9 +21061,9 @@ $as_echo_n "checking for Berkeley DB files in $d... "
|
|
db_libfile="$d/$bdb_loclibdir/libdb$sversion$bdb_libext"
|
|
try_headers="db.h db$version/db.h db$sversion/db.h"
|
|
else
|
|
- db_libfilename="libdb-$version$bdb_libext"
|
|
- db_lib="-ldb-$version"
|
|
- db_libfile="$d/$bdb_loclibdir/libdb-$version$bdb_libext"
|
|
+ db_libfilename="libdb$bdb_libext.${LIBdb_VERSION}"
|
|
+ db_lib="-ldb"
|
|
+ db_libfile="$d/$bdb_loclibdir/libdb$bdb_libext.${LIBdb_VERSION}"
|
|
try_headers="db.h db$version/db.h db$sversion/db.h"
|
|
fi
|
|
fi
|