Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
Summary: | --with-system-mozilla always sucks in libxul.pc | ||||||
---|---|---|---|---|---|---|---|
Product: | Build Tools | Reporter: | rene | ||||
Component: | configure | Assignee: | caolanm | ||||
Status: | CLOSED FIXED | QA Contact: | issues@tools <issues> | ||||
Severity: | Trivial | ||||||
Priority: | P3 | CC: | issues | ||||
Version: | current | ||||||
Target Milestone: | OOo 3.1 | ||||||
Hardware: | All | ||||||
OS: | All | ||||||
Issue Type: | DEFECT | Latest Confirmation in: | --- | ||||
Developer Difficulty: | --- | ||||||
Attachments: |
|
Description
rene
2009-01-22 16:32:42 UTC
Created attachment 59704 [details]
How about this
--- configure.in (revision 266964) +++ configure.in (working copy) @@ -4029,7 +4029,13 @@ PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr ) fi - if $PKG_CONFIG --exists libxul ; then + if test "$MOZ_FLAVOUR" != "libxul"; then + PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" ) + MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom` + MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom` + fi + + if test -z "$HASXPCOM"; then PKG_CHECK_MODULES( MOZILLAXPCOM, libxul ) MOZ_INC=`$PKG_CONFIG --variable=includedir libxul` MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul` why not just if .. else .. fi instead of test -z "$HASXPCOM"? To support the case that I *think* might exist for --with-system-mozilla=xulrunner which may on some distributions provide "xulrunner-xpcom" while on others only "libxul" cmc: ah, yes, there was something.. committed to cws configure23 verified integrated, closing |