Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. C++ comments removed from setup.h

Browse Source 
2. --with-dynlib option added (wxUSE_DYNLIB_CLASS)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-23 17:48:53 +00:00
parent 69a282d4e6
commit eb9bbf52b6
3 changed files with 590 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

824
configure vendored
View File

File diff suppressed because it is too large Load Diff

30
configure.in
View File

@@ -760,6 +760,7 @@ DEFAULT_wxUSE_INTL=1
DEFAULT_wxUSE_CONFIG=1
DEFAULT_wxUSE_STREAMS=1
DEFAULT_wxUSE_SERIAL=1
DEFAULT_wxUSE_DYNLIB_CLASS=1
DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
DEFAULT_WX_NORMALIZED_PS_FONTS=1
@@ -843,6 +844,10 @@ AC_OVERRIDES(threads,threads,
**--with-threads for enabling threads,
wxUSE_THREADS)
AC_OVERRIDES(dynlib,dynlib,
**--with-dynlib to compile wxLibrary class,
wxUSE_DYNLIB_CLASS)
dnl ----------------------------------------------------------------
dnl user options for libraries
dnl ----------------------------------------------------------------
@@ -1231,6 +1236,31 @@ if test "$wxUSE_SERIAL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
fi
dnl ------------------------------------------------------------------------
dnl wxLibrary class
dnl ------------------------------------------------------------------------
HAVE_DL_FUNCS=0
if test "$wxUSE_DYNLIB_CLASS" = "1"; then
dnl the test is a bit complicated because we check for dlopen() both with
dnl and without -ldl
AC_CHECK_FUNCS(dlopen,
[AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
[AC_CHECK_LIB(dl, dlopen,
[AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
AC_CHECK_FUNCS(shl_load, [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1])
if test "$HAVE_DL_FUNCS" = 0; then
AC_MSG_WARN("--with-dynlib will be disabled because no function was found to load a shared library on this platform")
wxUSE_DYNLIB_CLASS=0
fi
fi
if test "$wxUSE_DYNLIB_CLASS" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_DYNLIB_CLASS,$wxUSE_DYNLIB_CLASS)
fi
dnl ----------------------------------------------------------------
dnl Register Prolog and Resources options for makefiles and setup.h
dnl ----------------------------------------------------------------

76
setup/setup.hin
View File

@@ -5,9 +5,9 @@
Leave the following blank line there!! Autoheader needs it. */
// ------------------------------------------------------------------------
// Features as requested by configure
// ------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* Features as requested by configure */
/* ------------------------------------------------------------------------ */
#ifndef __GTKSETUPH__
#define __GTKSETUPH__
@@ -35,9 +35,9 @@
#undef __ULTRIX__
#undef __DATA_GENERAL__
//------------------------------------------------------------------------
// library options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* library options */
/* ------------------------------------------------------------------------ */
/*
* Use zlib
@@ -64,9 +64,9 @@
*/
#define wxHAVE_GLIBC2 0
//------------------------------------------------------------------------
// GUI control options (always enabled in wxGTK)
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* GUI control options (always enabled in wxGTK) */
/* ------------------------------------------------------------------------ */
/*
* Use gauge item
*/
@@ -88,9 +88,9 @@
*/
#define wxUSE_TOOLBAR 1
//------------------------------------------------------------------------
// non-GUI options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* non-GUI options */
/* ------------------------------------------------------------------------ */
/*
* Use time and date classes
@@ -122,9 +122,9 @@
*/
#define wxUSE_CONSTRAINTS 1
//------------------------------------------------------------------------
// PS options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* PS options */
/* ------------------------------------------------------------------------ */
/*
* Use font metric files in GetTextExtent for wxPostScriptDC
@@ -137,9 +137,9 @@
*/
#define wxUSE_POSTSCRIPT 0
//------------------------------------------------------------------------
// wxString options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* wxString options */
/* ------------------------------------------------------------------------ */
/*
* Compile wxString with wide character (Unicode) support?
@@ -155,9 +155,9 @@
*/
#define wxUSE_WCSRTOMBS 0
//------------------------------------------------------------------------
// misc options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* misc options */
/* ------------------------------------------------------------------------ */
/*
* Use Interprocess communication
@@ -179,10 +179,14 @@
* Use dnd
*/
#define wxUSE_DRAG_AND_DROP 0
/*
* Use wxLibrary class
*/
#define wxUSE_DYNLIB_CLASS 0
//------------------------------------------------------------------------
// architecture options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* architecture options */
/* ------------------------------------------------------------------------ */
/*
* Use the mdi architecture
@@ -197,9 +201,9 @@
*/
#define wxUSE_PRINTING_ARCHITECTURE 0
//------------------------------------------------------------------------
// Prolog and wxWindows' resource system options
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* Prolog and wxWindows' resource system options */
/* ------------------------------------------------------------------------ */
/*
* Use Prolog IO
@@ -214,9 +218,9 @@
*/
#define wxUSE_WX_RESOURCES 0
//------------------------------------------------------------------------
// the rest
//------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* the rest */
/* ------------------------------------------------------------------------ */
/*
* Use wxWindows help facility (needs wxUSE_IPC 1)
@@ -284,9 +288,9 @@
*/
#define CONST_COMPATIBILITY 0
// ------------------------------------------------------------------------
// System-specific stuff
// ------------------------------------------------------------------------
/* ------------------------------------------------------------------------ */
/* System-specific stuff */
/* ------------------------------------------------------------------------ */
/* acconfig.h
This file is in the public domain.
@@ -357,6 +361,12 @@
/* Define if you have vprintf() */
#undef HAVE_VPRINTF
/* Define if you have dlopen() */
#undef HAVE_DLOPEN
/* Define if you have shl_load() */
#undef HAVE_SHL_LOAD
/* Define if you have vsnprintf() */
#undef HAVE_VSNPRINTF