INTEGRATION: CWS dmake47 (1.10.12); FILE MERGED

2006/11/12 05:25:25 vq 1.10.12.2: #i71422# Remove unused macro and regenerate autotools files.
2006/09/28 21:16:23 vq 1.10.12.1: #i69953# Clean up of the autotooling.

dmake/startup/unix/Makefile.in

@@ -90,6 +90,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,8 +105,10 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
-OS_LIBRARY = @OS_LIBRARY@
-OS_SUBDIRS = @OS_SUBDIRS@
+OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
+OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
+OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
+OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
 OS_TYPE = @OS_TYPE@
 OS_VERSION = @OS_VERSION@
 PACKAGE = @PACKAGE@
@@ -121,8 +124,6 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -137,19 +138,26 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@