Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/fix-605978 into lp:ubuntuone-client

  1. fix-605978
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 659
Merged at revision: 660
Proposed branch: lp:~dobey/ubuntuone-client/fix-605978
Merge into: lp:ubuntuone-client
Diff against target: 15 lines (+4/-1)
1 file modified
configure.ac (+4/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-605978
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
John Lenton (community) Approve
Review via email: mp+33811@code.launchpad.net

Commit message

Error out in configure if lndir is not found

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-08-26 16:01:44 +0000
3+++ configure.ac 2010-08-26 18:06:46 +0000
4@@ -25,7 +25,10 @@
5 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS} -I m4")
6
7 # Need lndir for builddir != srcdir builds, because Python is not sane
8-AC_PATH_PROG([LNDIR], [lndir], [false])
9+AC_PATH_PROG([LNDIR], [lndir], [])
10+if test "x$LNDIR" = "x"; then
11+ AC_MSG_ERROR([lndir is required to build ubuntuone-client])
12+fi
13
14 # Icon sizes we want to install
15 AC_SUBST([render_sizes], ["16x16 24x24 32x32 48x48"])

Subscribers

People subscribed via source and target branches