diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:37:46 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:37:46 +0000 |
| commit | ee660231be4d04375cf7a52f8a83f7d979571725 (patch) | |
| tree | d314deb810e93eae786e83cc4856db1df9b22bc2 /dmake/configure.in | |
| parent | 5e4ca33d8e2b8ae70304826b339109f9d716102f (diff) | |
INTEGRATION: CWS dmake411 (1.29.2); FILE MERGED
2007/10/13 23:43:18 vq 1.29.2.5: #i79272# Release dmake 4.11.
2007/09/23 22:05:02 vq 1.29.2.4: #i81855# More changes for the OS/2 port.
Patch provided by Yuri Dario.
2007/09/22 22:08:27 vq 1.29.2.3: RESYNC: (1.29-1.30); FILE MERGED
2007/07/28 17:12:02 vq 1.29.2.2: #i79815# Fix default DMAKEROOT macro value.
2007/07/05 15:58:50 vq 1.29.2.1: #i79271# Bump version to 4.11-cvs.
Diffstat (limited to 'dmake/configure.in')
| -rwxr-xr-x | dmake/configure.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dmake/configure.in b/dmake/configure.in index 1c8d86174d70..9317e58ad2db 100755 --- a/dmake/configure.in +++ b/dmake/configure.in @@ -6,7 +6,7 @@ dnl Set the package version dnl Don't forget to update the PACKAGE, VERSION and BUILDINFO macros in dnl dmake/win95/microsft/config.h to keep the native Microsoft C++ dnl compiler build happy. -AC_INIT(dmake, 4.9) +AC_INIT(dmake, 4.11) AC_CANONICAL_BUILD BUILDINFO="$build" @@ -62,6 +62,10 @@ OS_TYPE=unix ## The following allows like systems to share settings this is not meant to ## Imply that these OS are the same thing. case "$_os" in + "OS/2") + OS_VERSION=os2 + CASE_INSENSITIVE_FS=true + ;; "SunOS") OS_VERSION=solaris ;; @@ -84,9 +88,6 @@ case "$_os" in BUILDINFO="Windows / MS Visual C++" CASE_INSENSITIVE_FS=true ;; - "OS/2") - OS_VERSION=linux - ;; "Darwin") OS_VERSION=macosx # MacOSX is not garuanteed to be case insensitive, assume it's case @@ -160,7 +161,7 @@ else fi dnl Predefine the DMAKEROOT macro for unix targets. -eval dmakerootprefix="$datadir" +eval dmakerootprefix="$datarootdir" # $datadir is ${prefix}/share if not overridden test "x$dmakerootprefix" != "x${dmakerootprefix##NONE}" && dmakerootprefix=${ac_default_prefix}/share @@ -175,6 +176,7 @@ AC_CONFIG_FILES(dmakeroot.h Makefile startup/config.mk \ startup/unix/linux/Makefile startup/unix/solaris/Makefile \ startup/unix/macosx/Makefile startup/unix/sysvr4/Makefile \ startup/unix/cygwin/Makefile \ + startup/unix/os2/Makefile \ startup/winnt/Makefile startup/winnt/mingw/Makefile \ startup/winnt/msvc6/Makefile \ tests/Makefile) |