added --enable-official-build and --enable-vendor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
21
configure.in
21
configure.in
@@ -504,6 +504,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
|
||||
DEFAULT_wxUSE_MONOLITHIC=yes
|
||||
DEFAULT_wxUSE_OFFICIAL_BUILD=no
|
||||
else
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
DEFAULT_wxUSE_STL=no
|
||||
@@ -679,6 +680,7 @@ else
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
|
||||
DEFAULT_wxUSE_MONOLITHIC=yes
|
||||
DEFAULT_wxUSE_OFFICIAL_BUILD=no
|
||||
fi
|
||||
|
||||
dnl WX_ARG_WITH should be used to select whether an external package will be
|
||||
@@ -1076,6 +1078,16 @@ WX_ARG_ENABLE(ico_cur, [ --enable-icocur use Windows ICO and CUR fo
|
||||
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl some win32 settings
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWindows (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
|
||||
AC_ARG_ENABLE(vendor, [ --enable-vendor=VENDOR vendor name (win32 DLL only)], [VENDOR="$enableval"])
|
||||
if test "x$VENDOR" = "x"; then
|
||||
VENDOR="custom"
|
||||
fi
|
||||
|
||||
dnl General settings (needed for GUI and non-GUI compilations alike).
|
||||
dnl Path separator; ':' for unix, ';' for OS/2
|
||||
dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise
|
||||
@@ -5518,9 +5530,12 @@ else
|
||||
MONOLITHIC=0
|
||||
fi
|
||||
|
||||
dnl FIXME -- make configurable!
|
||||
VENDOR="custom"
|
||||
OFFICIAL_BUILD=0
|
||||
if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
|
||||
OFFICIAL_BUILD=1
|
||||
else
|
||||
OFFICIAL_BUILD=0
|
||||
fi
|
||||
|
||||
AC_SUBST(VENDOR)
|
||||
AC_SUBST(OFFICIAL_BUILD)
|
||||
|
||||
|
Reference in New Issue
Block a user