diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
| commit | 3680f27ebff58ece429c4e032f9ad84fb1372114 (patch) | |
| tree | 6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /databases/libgda4/files/patch-configure | |
| parent | 02c6e6b485454dc3f5a27cbc887d9e4aaf376a36 (diff) | |
Notes
Diffstat (limited to 'databases/libgda4/files/patch-configure')
| -rw-r--r-- | databases/libgda4/files/patch-configure | 62 |
1 files changed, 48 insertions, 14 deletions
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure index 6e42fcfab8ff..cf6a34b0c4ae 100644 --- a/databases/libgda4/files/patch-configure +++ b/databases/libgda4/files/patch-configure @@ -1,14 +1,48 @@ ---- configure.orig 2010-06-23 23:07:54.000000000 +0200 -+++ configure 2010-06-23 23:09:57.000000000 +0200 -@@ -18629,9 +18629,9 @@ - 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}|"` - 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}|"` - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +--- configure.orig 2010-11-14 17:29:29.000000000 +0100 ++++ configure 2010-11-14 17:33:39.000000000 +0100 +@@ -19487,9 +19487,9 @@ + 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)|"` + 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)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=$introspection_makefile +@@ -19586,7 +19586,7 @@ + echo "$LIBCRYPTO_PKG_ERRORS" >&5 + + if test "$enable_crypto" = "yes"; then +- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 ++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 + fi + have_crypto=no + +@@ -19594,7 +19594,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + if test "$enable_crypto" = "yes"; then +- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 ++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5 + fi + have_crypto=no + +@@ -21772,6 +21772,15 @@ + fi + CFLAGS="$save_CFLAGS" + fi ++ else ++ if false; then ++ MDB_TRUE= ++ MDB_FALSE='#' ++else ++ MDB_TRUE='#' ++ MDB_FALSE= ++fi ++ + fi + + if test "$mdbtools_found" = "yes"; then |