mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- allow user to specify $WX_CONFIG variable before running configure, to

Browse Source 
override default.  This is useful if you have more than one wx installation,
  for example debug and release libraries.
- modified: Makefile.in configure.in configure
This commit is contained in:
Bryce Denney 2002-10-03 02:26:32 +00:00
parent cbf9307ad9
commit add4fbe892
3 changed files with 2043 additions and 4218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/Makefile.in
View File

@ -200,7 +200,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h: bxversion.h:
$(RM) -f bxversion.h $(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.91 2002-10-02 00:09:49 bdenney Exp $$' >> bxversion.h echo '// $$Id: Makefile.in,v 1.92 2002-10-03 02:26:32 bdenney Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -258,7 +258,7 @@ libbochs_cpu.a: @DEBUGGER_VAR@ $(BX_OBJS)
# for wxWindows port, on win32 platform # for wxWindows port, on win32 platform
wxbochs_resources.o: wxbochs.rc wxbochs_resources.o: wxbochs.rc
windres $(srcdir)/wxbochs.rc -o $@ --include-dir=`wx-config --prefix`/include windres $(srcdir)/wxbochs.rc -o $@ --include-dir=`@WX_CONFIG@ --prefix`/include
##################################################################### #####################################################################
# Install target for all platforms. # Install target for all platforms.

6246
bochs/configure vendored
View File

File diff suppressed because it is too large Load Diff

11
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT(bochs.h) AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.144 2002-10-02 12:11:25 bdenney Exp $]]) AC_REVISION([[$Id: configure.in,v 1.145 2002-10-03 02:26:32 bdenney Exp $]])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
dnl // Put Bochs version information right here so that it gets substituted dnl // Put Bochs version information right here so that it gets substituted
@ -1365,7 +1365,13 @@ INSTALL_LIST_FOR_PLATFORM=
# check for existence of and usable version of wxWindows. This comes # check for existence of and usable version of wxWindows. This comes
# early so that it could affect which one gets chosen. # early so that it could affect which one gets chosen.
AC_CHECK_PROG(WX_CONFIG, [ wx-config --version ], wx-config, not_found) if test x$WX_CONFIG = x; then
AC_CHECK_PROG(WX_CONFIG, [ wx-config --version ], wx-config, not_found)
fi
AC_MSG_CHECKING(for wxWindows configuration script)
AC_MSG_RESULT($WX_CONFIG)
AC_MSG_NOTICE([using $WX_CONFIG as wxWindows configuration script])
ok_wx_version=0 ok_wx_version=0
AC_MSG_CHECKING(for wxWindows library version) AC_MSG_CHECKING(for wxWindows library version)
if test x$WX_CONFIG != xnot_found; then if test x$WX_CONFIG != xnot_found; then
@ -1511,6 +1517,7 @@ fi
AC_SUBST(GUI_CFLAGS) AC_SUBST(GUI_CFLAGS)
AC_SUBST(GUI_CXXFLAGS) AC_SUBST(GUI_CXXFLAGS)
AC_SUBST(WX_CONFIG)
AC_SUBST(WX_CFLAGS) AC_SUBST(WX_CFLAGS)
AC_SUBST(WX_CXXFLAGS) AC_SUBST(WX_CXXFLAGS)