mirror of
https://github.com/gnustep/libs-back.git
synced 2025-02-23 11:51:27 +00:00
Fix server configure
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@13600 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
0da7584976
commit
efa3e97e4f
5 changed files with 24 additions and 6 deletions
|
@ -1,3 +1,8 @@
|
|||
2002-05-06 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac (BUILD_SERVER): Set to predefined define
|
||||
* Source/GSBackend.m: Use it.
|
||||
|
||||
2002-05-05 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac: Simplify backend selection using --enable-server
|
||||
|
|
|
@ -34,9 +34,9 @@
|
|||
+ (void) initializeBackend;
|
||||
@end
|
||||
|
||||
#if BUILD_SERVER == x11
|
||||
#if BUILD_SERVER == SERVER_x11
|
||||
#include <x11/XGServer.h>
|
||||
#elif BUILD_SERVER == win32
|
||||
#elif BUILD_SERVER == SERVER_win32
|
||||
#include <win32/WIN32Server.h>
|
||||
#endif
|
||||
|
||||
|
@ -52,9 +52,9 @@
|
|||
NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];
|
||||
|
||||
/* Load in only one server */
|
||||
#if BUILD_SERVER == x11
|
||||
#if BUILD_SERVER == SERVER_x11
|
||||
[XGServer initializeBackend];
|
||||
#elif BUILD_SERVER == win32
|
||||
#elif BUILD_SERVER == SERVER_win32
|
||||
[WIN32Server initializeBackend];
|
||||
#else
|
||||
[NSException raise: NSInternalInconsistencyException
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
|
||||
#define SERVER_x11 1
|
||||
#define SERVER_win32 2
|
||||
|
||||
|
||||
/* Define to type of graphics context to build */
|
||||
#undef BUILD_GRAPHICS
|
||||
|
||||
|
|
5
configure
vendored
5
configure
vendored
|
@ -5301,7 +5301,7 @@ echo $ECHO_N "checking Backend Server... $ECHO_C" >&6
|
|||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define BUILD_SERVER $BUILD_SERVER
|
||||
#define BUILD_SERVER SERVER_$BUILD_SERVER
|
||||
_ACEOF
|
||||
|
||||
echo "$as_me:$LINENO: result: $BUILD_SERVER" >&5
|
||||
|
@ -5325,6 +5325,9 @@ elif test x"$BUILD_GRAPHICS" = "xart"; then
|
|||
GRAPHIC_LIBS="$LIBART_LIBS $GRAPHIC_LIBS"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Set the name of the backend
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
@ -407,7 +407,7 @@ BUILD_SERVER=$enable_server
|
|||
BUILD_GRAPHICS="$enable_graphics"
|
||||
AC_MSG_CHECKING(Backend Server)
|
||||
AC_SUBST(BUILD_SERVER)
|
||||
AC_DEFINE_UNQUOTED(BUILD_SERVER,$BUILD_SERVER,
|
||||
AC_DEFINE_UNQUOTED(BUILD_SERVER,SERVER_$BUILD_SERVER,
|
||||
[Define to type of window server to build])
|
||||
AC_MSG_RESULT($BUILD_SERVER)
|
||||
|
||||
|
@ -424,6 +424,11 @@ elif test x"$BUILD_GRAPHICS" = "xart"; then
|
|||
GRAPHIC_LIBS="$LIBART_LIBS $GRAPHIC_LIBS"
|
||||
fi
|
||||
|
||||
AH_TOP([
|
||||
#define SERVER_x11 1
|
||||
#define SERVER_win32 2
|
||||
])
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Set the name of the backend
|
||||
#--------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue