Change the default to the new XML-configured menubar. Configure
--with-old-menubar to get the old menubar.
This commit is contained in:
parent
88e2ffabfe
commit
2bcb4f099f
1 changed files with 9 additions and 9 deletions
18
configure.ac
18
configure.ac
|
@ -81,14 +81,14 @@ else
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
|
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
|
||||||
|
|
||||||
dnl Specify if we want the new XML menu; default to the old one
|
dnl Specify if we want the old menubar; default to the new one
|
||||||
AC_ARG_WITH(new-menubar, [ --with-new-menubar Use the new XML menu bar])
|
AC_ARG_WITH(old-menubar, [ --with-old-menubar Use the old menu bar])
|
||||||
if test "x$with_new_menubar" = "xyes" ; then
|
if test "x$with_old_menubar" = "xyes" ; then
|
||||||
echo "Building with new menubar"
|
echo "Building with old menubar"
|
||||||
else
|
|
||||||
AC_DEFINE([FG_OLD_MENUBAR], 1,
|
AC_DEFINE([FG_OLD_MENUBAR], 1,
|
||||||
[Define to build with old menubar])
|
[Define to build with old menubar])
|
||||||
echo "Building with old menubar"
|
else
|
||||||
|
echo "Building with new menubar"
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
|
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
|
||||||
|
|
||||||
|
@ -619,10 +619,10 @@ else
|
||||||
echo "Using FGEnvironment"
|
echo "Using FGEnvironment"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_new_menubar" != "x"; then
|
if test "x$with_old_menubar" != "x"; then
|
||||||
echo "Using new menubar"
|
echo "Using old menubar"
|
||||||
else
|
else
|
||||||
echo "Defaulting to old menubar"
|
echo "Defaulting to new XML-configurable menubar"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_threads" = "xyes"; then
|
if test "x$with_threads" = "xyes"; then
|
||||||
|
|
Loading…
Reference in a new issue