Attachment 147818 Details for Bug 228082 – Proposed Fix

[patch] Proposed Fix

diffs.txt (text/plain), 2.88 KB, created by Nathan Kinder on 2007-02-09 21:51:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-02-09 21:51:05 UTC

Size: 2.88 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.15
>diff -u -5 -t -r1.15 configure.ac
>--- configure.ac	6 Feb 2007 15:51:22 -0000	1.15
>+++ configure.ac	9 Feb 2007 20:35:15 -0000
>@@ -57,10 +57,23 @@
>   AC_MSG_RESULT(no)
>   debug_defs=""
> ])
> AC_SUBST([debug_defs])
> 
>+# Used for legacy style packaging where we bundle all of the dependencies.
>+AC_MSG_CHECKING(for --enable-bundle)
>+AC_ARG_ENABLE(bundle, [  --enable-bundle      Enable bundled dependencies],
>+[
>+  AC_MSG_RESULT(yes)
>+  bundle="1";
>+],
>+[
>+  AC_MSG_RESULT(no)
>+  bundle="";
>+])
>+AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
>+
> AC_PREFIX_DEFAULT([/opt/fedora-ds])
> 
> # installation paths - by default, configure will just
> # use /usr as the prefix for everything, which means
> # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
>
>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.22
>diff -u -5 -t -r1.22 Makefile.am
>--- Makefile.am 8 Feb 2007 18:40:12 -0000       1.22
>+++ Makefile.am 9 Feb 2007 20:37:59 -0000
>@@ -922,10 +922,31 @@
> # the paths and other tokens with the real values set during configure/make
> # note that we cannot just use AC_OUTPUT to do this for us, since it will do
> # things like this:
> # LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds
> # i.e. it literally copies in '${prefix}' rather than expanding it out - we
> # want this instead:
> # LD_LIBRARY_PATH = /usr/lib/fedora-ds
>+if BUNDLE
>+fixupcmd = sed \
>+        -e 's,@bindir\@,$(bindir),g' \
>+        -e 's,@sbindir\@,$(sbindir),g' \
>+        -e 's,@libdir\@,$(libdir),g' \
>+        -e 's,@nspr_libdir\@,$(libdir),g' \
>+        -e 's,@nss_libdir\@,$(libdir),g' \
>+        -e 's,@ldapsdk_libdir\@,$(libdir),g' \
>+        -e 's,@ldapsdk_bindir\@,$(bindir),g' \
>+        -e 's,@db_libdir\@,$(libdir),g' \
>+        -e 's,@db_bindir\@,$(bindir),g' \
>+        -e 's,@sasl_libdir\@,$(libdir),g' \
>+        -e 's,@netsnmp_libdir\@,$(libdir),g' \
>+        -e 's,@propertydir\@,$(propertydir),g' \
>+        -e 's,@datadir\@,$(datadir),g' \
>+        -e 's,@schemadir\@,$(schemadir),g' \
>+        -e 's,@serverdir\@,$(serverdir),g' \
>+        -e 's,@serverplugindir\@,$(serverplugindir),g' \
>+        -e 's,@taskdir\@,$(taskdir),g' \
>+        -e 's,@configdir\@,$(configdir),g'
>+else
> fixupcmd = sed \
>         -e 's,@bindir\@,$(bindir),g' \
>         -e 's,@sbindir\@,$(sbindir),g' \
>         -e 's,@libdir\@,$(libdir),g' \
>         -e 's,@nspr_libdir\@,$(nspr_libdir),g' \
>@@ -941,9 +962,10 @@
>         -e 's,@schemadir\@,$(schemadir),g' \
>         -e 's,@serverdir\@,$(serverdir),g' \
>         -e 's,@serverplugindir\@,$(serverplugindir),g' \
>         -e 's,@taskdir\@,$(taskdir),g' \
>         -e 's,@configdir\@,$(configdir),g'
>+endif
>
> %: %.in
>         mkdir -p $(dir $@)
>         $(fixupcmd) $^ > $@

Actions: View | Diff

Attachments on bug 228082: 147818 | 147822 | 147824