Remove some completely unused variables from configure.

RESFLAGS, RESPROGRAMOBJ, WIN32INSTALL and AFMINSTALL were not used anywhere so
don't bother defining them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-13 23:23:23 +00:00
parent d439c2517e
commit 7b7b19d2f2
2 changed files with 2 additions and 45 deletions

23
configure vendored
View File

@@ -634,8 +634,6 @@ POSTLINK_COMMAND
LIBWXMACRES LIBWXMACRES
WX_RESOURCES_MACOSX_DATA WX_RESOURCES_MACOSX_DATA
WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_ASCII
RESPROGRAMOBJ
RESFLAGS
RESCOMP RESCOMP
WX_VERSION_TAG WX_VERSION_TAG
DMALLOC_LIBS DMALLOC_LIBS
@@ -662,8 +660,6 @@ TOOLCHAIN_FULLNAME
TOOLCHAIN_NAME TOOLCHAIN_NAME
TOOLKIT_DIR TOOLKIT_DIR
TOOLKIT TOOLKIT
WIN32INSTALL
AFMINSTALL
USE_GUI USE_GUI
WX_LIBRARY_BASENAME_GUI WX_LIBRARY_BASENAME_GUI
WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_NOGUI
@@ -19823,8 +19819,6 @@ if test "x$ac_cv_lib_cExt_drand48" = xyes; then :
LIBS="$LIBS -lcExt" LIBS="$LIBS -lcExt"
fi fi
else
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5
$as_echo_n "checking for gcc/libc version... " >&6; } $as_echo_n "checking for gcc/libc version... " >&6; }
@@ -23247,9 +23241,6 @@ fi
AFMINSTALL=
WIN32INSTALL=
TOOLKIT= TOOLKIT=
TOOLKIT_INCLUDE= TOOLKIT_INCLUDE=
WIDGET_SET= WIDGET_SET=
@@ -23295,12 +23286,7 @@ fi
LIBS="$LIBS -lkernel32 -luser32" LIBS="$LIBS -lkernel32 -luser32"
esac esac
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
WIN32INSTALL=win32install
fi fi
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
@@ -24644,7 +24630,6 @@ done
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
AFMINSTALL=afminstall
TOOLKIT=GTK TOOLKIT=GTK
GUIDIST=GTK_DIST GUIDIST=GTK_DIST
@@ -24914,7 +24899,6 @@ $as_echo "MicroWindows' libraries found." >&6; }
wxUSE_UNIVERSAL="yes" wxUSE_UNIVERSAL="yes"
AFMINSTALL=afminstall
TOOLKIT=MICROWIN TOOLKIT=MICROWIN
GUIDIST=MICROWIN_DIST GUIDIST=MICROWIN_DIST
@@ -25612,7 +25596,6 @@ fi
GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
AFMINSTALL=afminstall
COMPILED_X_PROGRAM=0 COMPILED_X_PROGRAM=0
fi fi
@@ -41394,10 +41377,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq

View File

@@ -1464,9 +1464,6 @@ case "${host}" in
dnl More complete Unix emulation for unix-like ports dnl More complete Unix emulation for unix-like ports
dnl by linking in POSIX/2's cExt (if available). dnl by linking in POSIX/2's cExt (if available).
AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt") AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
else
dnl Include resources for the "native" port (wxPM).
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi fi
dnl Check for the gcc version (and thereby for the C runtime library). dnl Check for the gcc version (and thereby for the C runtime library).
dnl wx_cv_gccversion = EMX2 -> Standard EMX environment dnl wx_cv_gccversion = EMX2 -> Standard EMX environment
@@ -2796,9 +2793,6 @@ dnl ----------------------------------------------------------------
dnl search for toolkit (widget sets) dnl search for toolkit (widget sets)
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
AFMINSTALL=
WIN32INSTALL=
TOOLKIT= TOOLKIT=
TOOLKIT_INCLUDE= TOOLKIT_INCLUDE=
WIDGET_SET= WIDGET_SET=
@@ -2832,17 +2826,8 @@ if test "$USE_WIN32" = 1 ; then
LIBS="$LIBS -lkernel32 -luser32" LIBS="$LIBS -lkernel32 -luser32"
esac esac
dnl This one is still used by some sample makefiles. dnl Flags to be passed to windres by the applications using wxWidgets.
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
dnl This lot we export to wx-config. It must add the relevant
dnl include directories at the point when they can be known.
dnl (but are these (still) required anyway?)
WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install
fi fi
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
@@ -3055,7 +3040,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
AFMINSTALL=afminstall
TOOLKIT=GTK TOOLKIT=GTK
GUIDIST=GTK_DIST GUIDIST=GTK_DIST
@@ -3124,7 +3108,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
wxUSE_UNIVERSAL="yes" wxUSE_UNIVERSAL="yes"
AFMINSTALL=afminstall
TOOLKIT=MICROWIN TOOLKIT=MICROWIN
GUIDIST=MICROWIN_DIST GUIDIST=MICROWIN_DIST
@@ -3147,7 +3130,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl this junk out dnl this junk out
GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
AFMINSTALL=afminstall
COMPILED_X_PROGRAM=0 COMPILED_X_PROGRAM=0
fi fi
@@ -8344,8 +8326,6 @@ AC_SUBST(WX_LIBRARY_BASENAME_GUI)
dnl toolkit options dnl toolkit options
AC_SUBST(USE_GUI) AC_SUBST(USE_GUI)
AC_SUBST(AFMINSTALL)
AC_SUBST(WIN32INSTALL)
AC_SUBST(TOOLKIT) AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLKIT_DIR)
AC_SUBST(TOOLCHAIN_NAME) AC_SUBST(TOOLCHAIN_NAME)
@@ -8398,8 +8378,6 @@ dnl additional resurces settings
AC_SUBST(RESCOMP) AC_SUBST(RESCOMP)
AC_SUBST(WINDRES) AC_SUBST(WINDRES)
AC_SUBST(REZ) AC_SUBST(REZ)
AC_SUBST(RESFLAGS)
AC_SUBST(RESPROGRAMOBJ)
AC_SUBST(WX_RESOURCES_MACOSX_ASCII) AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
AC_SUBST(WX_RESOURCES_MACOSX_DATA) AC_SUBST(WX_RESOURCES_MACOSX_DATA)