Bug 360162 - Create build option for MOZ_PLACES_BOOKMARKS (r=bsmedberg)

This commit is contained in:
dietrich%mozilla.com 2006-12-03 21:19:21 +00:00
parent 7b1ea8ce39
commit 5718560d0a
3 changed files with 33 additions and 0 deletions

View File

@ -146,6 +146,7 @@ MOZ_PROFILESHARING = @MOZ_PROFILESHARING@
MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
MOZ_FEEDS = @MOZ_FEEDS@
MOZ_PLACES = @MOZ_PLACES@
MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKMARKS@
MOZ_STORAGE = @MOZ_STORAGE@
MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@

20
configure vendored
View File

@ -12512,6 +12512,7 @@ browser)
MOZ_UPDATER=1
MOZ_PHOENIX=1
MOZ_PLACES=
MOZ_PLACES_BOOKMARKS=
# always enabled for form history
MOZ_MORKREADER=1
MOZ_SAFE_BROWSING=1
@ -16132,6 +16133,24 @@ EOF
MOZ_MORKREADER=1
fi
# Check whether --enable-places-bookmarks was given.
if test "${enable_places_bookmarks+set}" = set; then
if !test -n "$MOZ_PLACES"; then
{ echo "configure: error: Option, places_bookmarks, requires --enable-places ($enableval)." 1>&2; exit 1; }
fi
enableval="$enable_places_bookmarks"
if test "$enableval" = "yes"; then
MOZ_PLACES_BOOKMARKS=1
else
{ echo "configure: error: Option, places, does not take an argument ($enableval)." 1>&2; exit 1; }
fi
fi
if test -n "$MOZ_PLACES_BOOKMARKS"; then
cat >> confdefs.h <<\EOF
#define MOZ_PLACES_BOOKMARKS 1
EOF
fi
# Check whether --enable-feeds or --disable-feeds was given.
if test "${enable_feeds+set}" = set; then
@ -21422,6 +21441,7 @@ s%@LDAP_CFLAGS@%$LDAP_CFLAGS%g
s%@LDAP_LIBS@%$LDAP_LIBS%g
s%@LIBICONV@%$LIBICONV%g
s%@MOZ_PLACES@%$MOZ_PLACES%g
s%@MOZ_PLACES_BOOKMARKS@%$MOZ_PLACES_BOOKMARKS%g
s%@MOZ_STORAGE@%$MOZ_STORAGE%g
s%@MOZ_FEEDS@%$MOZ_FEEDS%g
s%@NS_PRINTING@%$NS_PRINTING%g

View File

@ -4289,6 +4289,7 @@ browser)
MOZ_UPDATER=1
MOZ_PHOENIX=1
MOZ_PLACES=
MOZ_PLACES_BOOKMARKS=
# always enabled for form history
MOZ_MORKREADER=1
MOZ_SAFE_BROWSING=1
@ -5963,6 +5964,16 @@ if test -n "$MOZ_PLACES"; then
MOZ_MORKREADER=1
fi
dnl ========================================================
dnl = Enable places bookmarks (use places for bookmarks)
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(places-bookmarks,
[ --enable-places_bookmarks Enable 'places' for bookmarks backend],
MOZ_PLACES_BOOKMARKS=1,
MOZ_PLACES_BOOKMARKS= )
if test -n "$MOZ_PLACES_BOOKMARKS"; then
AC_DEFINE(MOZ_PLACES_BOOKMARKS)
fi
dnl ========================================================
dnl = Disable feed handling components
@ -7591,6 +7602,7 @@ AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
AC_SUBST(LIBICONV)
AC_SUBST(MOZ_PLACES)
AC_SUBST(MOZ_PLACES_BOOKMARKS)
AC_SUBST(MOZ_STORAGE)
AC_SUBST(MOZ_FEEDS)
AC_SUBST(NS_PRINTING)