Skip to content

Commit

Permalink
Disable building Qt3 integration by default
Browse files Browse the repository at this point in the history
Qt3 is deprecated and rarely used, change the default build
configuration not to build it unless --enable-qt3 is passed.

Avahi generally tries not to automatically disable components, requiring
explicit --disable-FEATURE so it's obvious things are being excluded but
we make an exception for outdated/EOL components.
  • Loading branch information
lathiat committed Apr 26, 2018
1 parent 5dbb327 commit 6ae7148
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ case `uname -s` in
export CFLAGS="-I/usr/pkg/include"
export LDFLAGS="-L/usr/pkg/lib"
export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-glib --disable-gtk --disable-manpages"
FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-glib --disable-gtk --disable-manpages"
;;
Linux)
;;
esac

case "$USER" in
lathiat|trentl)
FLAGS="$FLAGS --disable-qt4"
FLAGS="$FLAGS"
;;
sebest)
FLAGS="$FLAGS --disable-monodoc --enable-dbus=no --enable-mono=no --enable-qt3=no --enable-qt4=no --sysconfdir=/etc --localstatedir=/var --prefix=/usr --disable-manpages --disable-xmltoman"
FLAGS="$FLAGS --disable-monodoc --enable-dbus=no --enable-mono=no --enable-qt4=no --sysconfdir=/etc --localstatedir=/var --prefix=/usr --disable-manpages --disable-xmltoman"
;;
esac

CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@" --enable-qt3=no
CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@"
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,13 @@ GOBJECT_INTROSPECTION_CHECK([0.9.5])
# Check for Qt 3
#
AC_ARG_ENABLE(qt3,
AS_HELP_STRING([--disable-qt3],[Disable building of Qt3 mainloop integration]),
AS_HELP_STRING([--enable-qt3],[Enable building of Qt3 mainloop integration]),
[case "${enableval}" in
yes) HAVE_QT3=yes ;;
no) HAVE_QT3=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-qt3) ;;
esac],
[HAVE_QT3=yes])
[HAVE_QT3=no])

if test "x$HAVE_QT3" = "xyes" ; then
PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ])
Expand Down

0 comments on commit 6ae7148

Please sign in to comment.