Mercurial > dwindows
comparison configure.in @ 1351:751f127439f7
Changes to the build system to no longer use the version during configure.
The evaluation of the variables is delayed until during make.
This allows the version to be imported from the Version file.
Making a new version is as simple as updating the Version file...
autoconf and configure no longer need to be run each time.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 15 Nov 2011 14:39:58 +0000 |
parents | c993df7ffdd8 |
children | 6baf177f335c |
comparison
equal
deleted
inserted
replaced
1350:4333b58d879d | 1351:751f127439f7 |
---|---|
1 AC_INIT(winmain.c) | 1 AC_INIT(winmain.c) |
2 AC_CONFIG_HEADER(config.h) | 2 AC_CONFIG_HEADER(config.h) |
3 | |
4 DW_MAJOR_VERSION=2 | |
5 DW_MINOR_VERSION=1 | |
6 DW_SUB_VERSION=0 | |
7 | 3 |
8 TARGET="dwindows" | 4 TARGET="dwindows" |
9 TARGET2="dwcompat" | 5 TARGET2="dwcompat" |
10 AC_SUBST(TARGET) | 6 AC_SUBST(TARGET) |
11 AC_SUBST(TARGET2) | 7 AC_SUBST(TARGET2) |
17 DW_DEFINE=__UNIX__ | 13 DW_DEFINE=__UNIX__ |
18 SHAREDFLAG=-shared | 14 SHAREDFLAG=-shared |
19 SOSUFFIX=so | 15 SOSUFFIX=so |
20 LIBSUFFIX=a | 16 LIBSUFFIX=a |
21 LIBPREFIX=lib | 17 LIBPREFIX=lib |
22 AC_SUBST(DW_MAJOR_VERSION) | |
23 AC_SUBST(DW_MINOR_VERSION) | |
24 AC_SUBST(DW_SUB_VERSION) | |
25 | 18 |
26 INCLUDES="-I." | 19 INCLUDES="-I." |
27 | 20 |
28 AC_PROG_CC | 21 AC_PROG_CC |
29 AC_PROG_CXX | 22 AC_PROG_CXX |
64 | 57 |
65 dnl ---------------------- default targets to build ----------------- | 58 dnl ---------------------- default targets to build ----------------- |
66 if test $with_compat = yes; then | 59 if test $with_compat = yes; then |
67 COMPAT_OBJECT="compat.o" | 60 COMPAT_OBJECT="compat.o" |
68 INSTALL_COMPAT="installcompat" | 61 INSTALL_COMPAT="installcompat" |
69 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" | 62 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" |
70 else | 63 else |
71 COMPAT_OBJECT="" | 64 COMPAT_OBJECT="" |
72 INSTALL_COMPAT="" | 65 INSTALL_COMPAT="" |
73 SYSCONF_LINK_TARGET_SHARED2="" | 66 SYSCONF_LINK_TARGET_SHARED2="" |
74 fi | 67 fi |
75 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" | 68 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" |
76 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" | 69 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" |
77 | 70 |
78 dnl ---------------------- check for '--with-gtk+' switch ----------------- | 71 dnl ---------------------- check for '--with-gtk+' switch ----------------- |
79 AC_ARG_WITH(gtk, | 72 AC_ARG_WITH(gtk, |
80 [ --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX)], | 73 [ --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX)], |
151 ;; | 144 ;; |
152 *mingw32) | 145 *mingw32) |
153 AC_DEFINE(DW_USE_GTK) | 146 AC_DEFINE(DW_USE_GTK) |
154 ;; | 147 ;; |
155 *linux*) | 148 *linux*) |
156 SONAME="-Wl,-soname,lib$TARGET.so.$DW_MAJOR_VERSION" | 149 SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" |
157 ;; | 150 ;; |
158 *nto-qnx*) | 151 *nto-qnx*) |
159 DW_DIR="photon" | 152 DW_DIR="photon" |
160 DW_DEFINE=__PHOTON__ | 153 DW_DEFINE=__PHOTON__ |
161 build_gtk="no" | 154 build_gtk="no" |