283057 - Fold sqlite3 build into storage, honour ENABLE_TESTS

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Shaver (:shaver emeritus)]

.

Comment 1

[Mike Shaver (:shaver emeritus)]

Attachment: as summarized

Comment 2

[Benjamin Smedberg]

Comment on attachment 175055 [details] [diff] [review]
as summarized

>Index: storage/Makefile.in

>+DIRS		= ../db/sqlite3/src public src build

You are taking your life in your hands with the "..". You can expect errors,
but I'll let you do it if you will fix make-makefile errors later on.

Also, separate lines:

  ../db/sqlite3/src \
  public \
  src \

Comment 3

[Benjamin Smedberg]

 MOZ_ARG_ENABLE_BOOL(storage,
 [  --enable-storage        Enable mozStorage module and related components],
     MOZ_STORAGE=1,
     MOZ_STORAGE= )
-if test -n "$MOZ_STORAGE"; then
+if test -n "$MOZ_STORAGE" -o -n "$MOZ_CALENDAR"; then
     AC_DEFINE(MOZ_STORAGE)
 fi

Instead, please do:

if -n "$MOZ_CALENDAR"; then
  MOZ_STORAGE=1
fi
MOZ_ARG_ENABLE_BOOL(...

Comment 4

[Mike Shaver (:shaver emeritus)]

(In reply to comment #3)
>  MOZ_ARG_ENABLE_BOOL(storage,
>  [  --enable-storage        Enable mozStorage module and related components],
>      MOZ_STORAGE=1,
>      MOZ_STORAGE= )
> -if test -n "$MOZ_STORAGE"; then
> +if test -n "$MOZ_STORAGE" -o -n "$MOZ_CALENDAR"; then
>      AC_DEFINE(MOZ_STORAGE)
>  fi
> 
> Instead, please do:
> 
> if -n "$MOZ_CALENDAR"; then
>   MOZ_STORAGE=1
> fi
> MOZ_ARG_ENABLE_BOOL(...

Will that work?  Won't the FALSE case of MOZ_ARG_ENABLE_BOOL overwrite my =1
with its no-rval =?  I guess I can try it!

Comment 5

[Benjamin Smedberg]

> Will that work?  Won't the FALSE case of MOZ_ARG_ENABLE_BOOL overwrite my =1
> with its no-rval =?  I guess I can try it!

That's a common misconception. The actual macro declaration is at

http://lxr.mozilla.org/mozilla/source/build/autoconf/altoptions.m4#45
dnl MOZ_ARG_ENABLE_BOOL(           NAME, HELP, IF-YES [, IF-NO [, ELSE]])

So it won't overwrite unless somebody explicitly adds --disable-storage (and if
they do that, we assume they know what they're doing).

Comment 6

[Mike Shaver (:shaver emeritus)]

Committed the sqlite/storage parts, at long last.

Comment 7

[Nick Thomas [:nthomas] (UTC+12)]

Forgive my impudence, but shouldn't
   DIRS            = test                                                          
be
   DIRS           += test                         
in mozilla/storage/Makefile.in                                 

Comment 8

[Mike Shaver (:shaver emeritus)]

Uh, yes, quite.  Lemme update a tree!

Comment 9

[Mike Shaver (:shaver emeritus)]

Fixed, thanks.