AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added --enable-official-build and --enable-vendor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-28 09:11:32 +00:00
parent ef9bfb7103
commit 029b47ad2c
2 changed files with 79 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
configure vendored
View File

@ -1024,6 +1024,8 @@ Optional Features:
--enable-pnm use pnm images (PNM file format)
--enable-xpm use xpm images (XPM file format)
--enable-icocur use Windows ICO and CUR formats
--enable-official_build official build of wxWindows (win32 DLL only)
--enable-vendor=VENDOR vendor name (win32 DLL only)
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
--disable-gtktest Do not try to compile and run a test GTK program
@ -2113,6 +2115,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
@ -2288,6 +2291,7 @@ else
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_MONOLITHIC=yes
DEFAULT_wxUSE_OFFICIAL_BUILD=no
fi
@ -9449,6 +9453,57 @@ echo "${ECHO_T}no" >&6
fi
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6
no_cache=0
# Check whether --enable-official_build or --disable-official_build was given.
if test "${enable_official_build+set}" = set; then
enableval="$enable_official_build"
if test "$enableval" = yes; then
ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
else
ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
fi
else
LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD
fi;
eval "$ac_cv_use_official_build"
if test "$no_cache" != 1; then
echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp
fi
if test "$wxUSE_OFFICIAL_BUILD" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Check whether --enable-vendor or --disable-vendor was given.
if test "${enable_vendor+set}" = set; then
enableval="$enable_vendor"
VENDOR="$enableval"
fi;
if test "x$VENDOR" = "x"; then
VENDOR="custom"
fi
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
PATH_IFS=';'
@ -33721,8 +33776,12 @@ else
MONOLITHIC=0
fi
VENDOR="custom"
OFFICIAL_BUILD=0
if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
OFFICIAL_BUILD=1
else
OFFICIAL_BUILD=0
fi

21
configure.in
View File

@ -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)