Module: wine Branch: refs/heads/master Commit: 6d9af55a120df781f69e919bad05e35c813d0dbe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d9af55a120df781f69e919b...
Author: Mike McCormack mike@codeweavers.com Date: Mon Apr 17 18:17:18 2006 +0900
configure: Remove the --disable-debug and --disable-trace options.
---
configure | 26 +------------------------- configure.ac | 12 ------------ dlls/Makedll.rules.in | 3 +-- dlls/Makeimplib.rules.in | 3 +-- dlls/Maketest.rules.in | 3 +-- programs/Makeprog.rules.in | 3 +-- 6 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/configure b/configure index ed428e7..55afb90 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS RESOLVLIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH LDDLLRPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS RESOLVLIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH LDDLLRPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
# Initialize some variables set by options. @@ -861,8 +861,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-win16 do not include Win16 support - --disable-debug compile out all debugging messages - --disable-trace compile out TRACE messages --enable-win64 build a Win64 emulator on AMD64 (won't run Win32 binaries)
@@ -1369,16 +1367,6 @@ if test "${enable_win16+set}" = set; the enableval="$enable_win16"
fi; -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - -fi; -# Check whether --enable-trace or --disable-trace was given. -if test "${enable_trace+set}" = set; then - enableval="$enable_trace" - -fi; # Check whether --enable-win64 or --disable-win64 was given. if test "${enable_win64+set}" = set; then enableval="$enable_win64" @@ -1404,17 +1392,6 @@ if test "${with_wine_tools+set}" = set;
fi;
-DLLDEFS="" - -if test "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS" -fi -if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS" -fi - # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -20279,7 +20256,6 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t -s,@DLLDEFS@,$DLLDEFS,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t diff --git a/configure.ac b/configure.ac index ffc921d..6ea1906 100644 --- a/configure.ac +++ b/configure.ac @@ -13,24 +13,12 @@ AC_CONFIG_AUX_DIR(tools) dnl **** Command-line arguments ****
AC_ARG_ENABLE(win16, AC_HELP_STRING([--disable-win16],[do not include Win16 support])) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--disable-debug],[compile out all debugging messages])) -AC_ARG_ENABLE(trace, AC_HELP_STRING([--disable-trace],[compile out TRACE messages])) AC_ARG_ENABLE(win64, AC_HELP_STRING([--enable-win64], [build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
AC_ARG_WITH(opengl, AC_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses])) AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>]))
-AC_SUBST(DLLDEFS,"") -if test "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS" -fi -if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS" -fi - AC_CANONICAL_HOST case $host in x86_64*linux*) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 54488b9..f3ff734 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -9,12 +9,11 @@ # plus all variables required by the global Make.rules.in #
-DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ IMPLIBEXT = @IMPLIBEXT@ LDRPATH = @LDDLLRPATH@ -DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) +DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec SPEC_DEF = lib$(BASEMODULE).def diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 4d93ee7..be17698 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -6,9 +6,8 @@ # plus all variables required by the global Make.rules.in #
-DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ -DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) +DEFS = -D__WINESRC__ $(EXTRADEFS)
@MAKE_RULES@
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 73499b5..f1272c4 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -9,9 +9,8 @@ # plus all variables required by the global Make.rules.in #
-DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ -DEFS = $(DLLDEFS) $(EXTRADEFS) +DEFS = $(EXTRADEFS)
MODULE = $(TESTDLL:%.dll=%)_test.exe TESTLIST = testlist.c diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 4ef0ab7..019c726 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -9,10 +9,9 @@ # plus all variables required by the global Make.rules.in #
-DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ LDRPATH = @LDDLLRPATH@ -DEFS = $(DLLDEFS) $(EXTRADEFS) +DEFS = $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) ALL_LIBS = $(ALL_IMPORTS:%=-l%) -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) BASEMODULE = $(MODULE:.exe=)