make fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
parent
e66474166b
commit
77c85c2b2a
65
configure.in
65
configure.in
@ -1206,7 +1206,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl thread support for Unix (always available under Win32)
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_UNIX" = 1; then
|
||||
if test "$USE_UNIX" = 1; then
|
||||
|
||||
dnl the code below:
|
||||
dnl defines THREADS_OBJ which contains the object files to build
|
||||
@ -1216,16 +1216,16 @@ dnl defines wxUSE_THREADS=1 if thread support is activated
|
||||
THREADS_LINK=""
|
||||
THREADS_OBJ=""
|
||||
|
||||
if test "$wxUSE_THREADS" = "yes"; then
|
||||
if test "$wxUSE_WINE" = 1; then
|
||||
AC_MSG_WARN([Threads are not supported under WINE])
|
||||
wxUSE_THREADS="no"
|
||||
fi
|
||||
if test "$wxUSE_THREADS" = "yes" ; then
|
||||
if test "$wxUSE_WINE" = 1 ; then
|
||||
AC_MSG_WARN([Threads are not supported under WINE])
|
||||
wxUSE_THREADS="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_THREADS" = "yes"; then
|
||||
if test "$wxUSE_THREADS" = "yes" ; then
|
||||
dnl find if POSIX threads are available
|
||||
|
||||
|
||||
dnl standard lib name is pthread
|
||||
dnl We no longer test for pthread-0.7 as it breaks compilation on some
|
||||
dnl glibc2 systems, especially for static linkage.
|
||||
@ -1246,13 +1246,13 @@ if test "$wxUSE_THREADS" = "yes"; then
|
||||
])
|
||||
fi
|
||||
|
||||
if test -z "$THREADS_OBJ"; then
|
||||
wxUSE_THREADS=no
|
||||
AC_MSG_WARN(No thread support on this system)
|
||||
if test -z "$THREADS_OBJ" ; then
|
||||
wxUSE_THREADS=no
|
||||
AC_MSG_WARN(No thread support on this system)
|
||||
fi
|
||||
|
||||
dnl do other tests only if we are using threads
|
||||
if test "$wxUSE_THREADS" = "yes"; then
|
||||
if test "$wxUSE_THREADS" = "yes" ; then
|
||||
dnl LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
|
||||
|
||||
dnl define autoconf macro to check for given function in both pthread and
|
||||
@ -1316,6 +1316,7 @@ if test "$wxUSE_THREADS" = "yes"; then
|
||||
THREADS_LINK="-l$THREADS_LINK"
|
||||
fi
|
||||
|
||||
dnl from if USE_UNIX
|
||||
fi
|
||||
|
||||
if test "$wxUSE_THREADS" = "yes"; then
|
||||
@ -1352,42 +1353,42 @@ if test "$wxUSE_DEBUG_INFO" = "yes" ; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
|
||||
AC_DEFINE(WXDEBUG)
|
||||
WXDEBUG_DEFINE="-D__WXDEBUG__"
|
||||
AC_DEFINE(WXDEBUG)
|
||||
WXDEBUG_DEFINE="-D__WXDEBUG__"
|
||||
else
|
||||
WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
|
||||
WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MEM_TRACING" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_MEMORY_TRACING)
|
||||
AC_DEFINE(wxUSE_GLOBAL_MEMORY_OPERATORS)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
|
||||
AC_DEFINE(wxUSE_MEMORY_TRACING)
|
||||
AC_DEFINE(wxUSE_GLOBAL_MEMORY_OPERATORS)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DMALLOC" = "yes" ; then
|
||||
DMALLOC_LINK="-ldmalloc"
|
||||
DMALLOC_LINK="-ldmalloc"
|
||||
fi
|
||||
|
||||
PROFILE=
|
||||
if test "$wxUSE_PROFILE" = "yes" ; then
|
||||
PROFILE="-pg"
|
||||
PROFILE="-pg"
|
||||
fi
|
||||
|
||||
CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
|
||||
CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
|
||||
if test "$wxUSE_OPTIMISE" = "no" ; then
|
||||
OPTIMISE=
|
||||
OPTIMISE=
|
||||
else
|
||||
if test "$GCC" = yes ; then
|
||||
OPTIMISE="-O2 -fno-rtti -fno-exceptions"
|
||||
case "${host}" in
|
||||
i586-*-*|i686-*-* )
|
||||
OPTIMISE="${OPTIMISE} "
|
||||
;;
|
||||
esac
|
||||
else
|
||||
OPTIMISE="-O"
|
||||
fi
|
||||
if test "$GCC" = yes ; then
|
||||
OPTIMISE="-O2 -fno-rtti -fno-exceptions"
|
||||
case "${host}" in
|
||||
i586-*-*|i686-*-* )
|
||||
OPTIMISE="${OPTIMISE} "
|
||||
;;
|
||||
esac
|
||||
else
|
||||
OPTIMISE="-O"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -1726,7 +1727,7 @@ if test "$wxUSE_X_RESOURCES" = "yes"; then
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl IPC: IPC, d-n-d, clipboard, ...
|
||||
dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_IPC" = "yes"; then
|
||||
|
||||
@ -17,8 +17,8 @@ cd ../..
|
||||
cp wxGTK.spec ~/wxgtk_dist/wxGTK
|
||||
cp Makefile.am ~/wxgtk_dist/wxGTK
|
||||
cp acconfig.h ~/wxgtk_dist/wxGTK
|
||||
cp aclocal.m4 ~/wxgtk_dist/wxGTK
|
||||
cp acinclude.m4 ~/wxgtk_dist/wxGTK
|
||||
cp aclocal.m4 ~/wxgtk_dist/wxGTK
|
||||
cp configure.in ~/wxgtk_dist/wxGTK
|
||||
cp configure ~/wxgtk_dist/wxGTK
|
||||
cp config.sub ~/wxgtk_dist/wxGTK
|
||||
|
||||
@ -214,15 +214,19 @@ not been defined. And Make in some circumstances as well...
|
||||
* General options
|
||||
-------------------
|
||||
|
||||
The confiugre options have not yet been thoroughly tested
|
||||
in wxWindows snapshot 6.
|
||||
Given below are the commands to change the default behaviour,
|
||||
i.e. if it says "--disable-threads" it means that threads
|
||||
are enabled by default.
|
||||
|
||||
Many of the confiugre options have been thoroughly tested
|
||||
in wxWindows snapshot 6, but not yet all (ODBC not).
|
||||
|
||||
Normally, you won't have to choose a toolkit, because when
|
||||
you download wxGTK, it will default to --with-gtk etc. But
|
||||
if you use all of our CVS repository you have to choose a
|
||||
toolkit. You must do this by running configure with either of:
|
||||
|
||||
--with-gtk Use the GIMP ToolKit (GTK)
|
||||
--without-gtk Don't use the GIMP ToolKit (GTK)
|
||||
|
||||
--with-motif Use either Motif or Lesstif
|
||||
Configure will look for both.
|
||||
@ -264,8 +268,8 @@ The following options handle the kind of library you want to build.
|
||||
* Feature Options
|
||||
-------------------
|
||||
|
||||
The confiugre options have not yet been thoroughly tested
|
||||
in wxWindows snapshot 6. ODBC not at all.
|
||||
Many of the confiugre options have been thoroughly tested
|
||||
in wxWindows snapshot 6, but not yet all (ODBC not).
|
||||
|
||||
When producing an executable that is linked statically with wxGTK
|
||||
you'll be surprised at its immense size. This can sometimes be
|
||||
@ -277,9 +281,9 @@ are
|
||||
|
||||
--without-libjpeg Disables JPEG image format code.
|
||||
|
||||
--without-odbc Disables ODBC code.
|
||||
{ --without-odbc Disables ODBC code. Not yet. }
|
||||
|
||||
--disable-wxresources Disables the use of *.wxr type
|
||||
--disable-resources Disables the use of *.wxr type
|
||||
resources.
|
||||
|
||||
--disable-threads Disables threads. Will also
|
||||
@ -295,6 +299,16 @@ are
|
||||
|
||||
--disable-streams Disables the wxStream classes.
|
||||
|
||||
--disable-file Disables the wxFile class.
|
||||
|
||||
--disable-textfile Disables the wxTextFile class.
|
||||
|
||||
--disable-intl Disables the internationalisation.
|
||||
|
||||
--disable-validators Disables validators.
|
||||
|
||||
--disable-accel Disables accel.
|
||||
|
||||
Apart from disabling certain features you can very often "strip"
|
||||
the program of its debugging information resulting in a significant
|
||||
reduction in size.
|
||||
|
||||
@ -27,10 +27,10 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
|
||||
|
||||
%prep
|
||||
%setup -n wxGTK
|
||||
./configure --prefix=%{pref} --with-threads
|
||||
./configure --prefix=%{pref} --enable-threads
|
||||
|
||||
%build
|
||||
make
|
||||
cd src && make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
Loading…
Reference in New Issue
Block a user