* configure.ac: Relocate some recent changes to a more logical location.
This commit is contained in:
parent
a6248f1390
commit
8df5745cf5
1 changed files with 7 additions and 12 deletions
19
configure.ac
19
configure.ac
|
@ -1885,6 +1885,13 @@ if test "${HAVE_W32}" = "yes"; then
|
|||
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
|
||||
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
|
||||
esac
|
||||
dnl Construct something of the form "24,4,0,0" with 4 components.
|
||||
comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
|
||||
|
||||
comma_space_version=`echo "$comma_version" | sed 's/,/, /g'`
|
||||
AC_SUBST(comma_version)
|
||||
AC_SUBST(comma_space_version)
|
||||
AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc])
|
||||
if test "${opsys}" = "cygwin"; then
|
||||
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
|
||||
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
|
||||
|
@ -4682,18 +4689,6 @@ case $opsys in
|
|||
;;
|
||||
esac
|
||||
|
||||
if test "${HAVE_W32}" = "yes"; then
|
||||
dnl Construct something of the form "24,4,0,0" with 4 components.
|
||||
comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
|
||||
|
||||
comma_space_version=`echo "$comma_version" | sed 's/,/, /g'`
|
||||
|
||||
AC_SUBST(comma_version)
|
||||
AC_SUBST(comma_space_version)
|
||||
AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc])
|
||||
fi
|
||||
|
||||
|
||||
XMENU_OBJ=
|
||||
XOBJ=
|
||||
FONT_OBJ=
|
||||
|
|
Loading…
Add table
Reference in a new issue