Mercurial > dwindows
comparison configure @ 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 | c5419ef79a77 |
children | 6baf177f335c |
comparison
equal
deleted
inserted
replaced
1350:4333b58d879d | 1351:751f127439f7 |
---|---|
663 ac_ct_CC | 663 ac_ct_CC |
664 CPPFLAGS | 664 CPPFLAGS |
665 LDFLAGS | 665 LDFLAGS |
666 CFLAGS | 666 CFLAGS |
667 CC | 667 CC |
668 DW_SUB_VERSION | |
669 DW_MINOR_VERSION | |
670 DW_MAJOR_VERSION | |
671 TARGET2 | 668 TARGET2 |
672 TARGET | 669 TARGET |
673 target_alias | 670 target_alias |
674 host_alias | 671 host_alias |
675 build_alias | 672 build_alias |
1365 --with-gtk3 specify this to build with GTK+ 3.x if available | 1362 --with-gtk3 specify this to build with GTK+ 3.x if available |
1366 --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX) | 1363 --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX) |
1367 --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX) | 1364 --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX) |
1368 --with-gtkhtml specify this to build dwindows with libgtkhtml-2 | 1365 --with-gtkhtml specify this to build dwindows with libgtkhtml-2 |
1369 --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed | 1366 --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed |
1370 --with-arch specify architecture: one of all, 32bit, 64bit, ppc, ppc64, x86_64, i386 | 1367 --with-arch specify architecture: one of all, 32bit, 64bit, intel, ppc, ppc64, x86_64, i386 |
1371 --with-glib-prefix=PFX Prefix where GLIB is installed (optional) | 1368 --with-glib-prefix=PFX Prefix where GLIB is installed (optional) |
1372 --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional) | 1369 --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional) |
1373 --with-gtk-prefix=PFX Prefix where GTK is installed (optional) | 1370 --with-gtk-prefix=PFX Prefix where GTK is installed (optional) |
1374 --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) | 1371 --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) |
1375 --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional) | 1372 --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional) |
2205 | 2202 |
2206 | 2203 |
2207 ac_config_headers="$ac_config_headers config.h" | 2204 ac_config_headers="$ac_config_headers config.h" |
2208 | 2205 |
2209 | 2206 |
2210 DW_MAJOR_VERSION=2 | |
2211 DW_MINOR_VERSION=1 | |
2212 DW_SUB_VERSION=0 | |
2213 | |
2214 TARGET="dwindows" | 2207 TARGET="dwindows" |
2215 TARGET2="dwcompat" | 2208 TARGET2="dwcompat" |
2216 | 2209 |
2217 | 2210 |
2218 | 2211 |
2223 DW_DEFINE=__UNIX__ | 2216 DW_DEFINE=__UNIX__ |
2224 SHAREDFLAG=-shared | 2217 SHAREDFLAG=-shared |
2225 SOSUFFIX=so | 2218 SOSUFFIX=so |
2226 LIBSUFFIX=a | 2219 LIBSUFFIX=a |
2227 LIBPREFIX=lib | 2220 LIBPREFIX=lib |
2228 | |
2229 | |
2230 | |
2231 | 2221 |
2232 INCLUDES="-I." | 2222 INCLUDES="-I." |
2233 | 2223 |
2234 ac_ext=c | 2224 ac_ext=c |
2235 ac_cpp='$CPP $CPPFLAGS' | 2225 ac_cpp='$CPP $CPPFLAGS' |
3656 | 3646 |
3657 | 3647 |
3658 if test $with_compat = yes; then | 3648 if test $with_compat = yes; then |
3659 COMPAT_OBJECT="compat.o" | 3649 COMPAT_OBJECT="compat.o" |
3660 INSTALL_COMPAT="installcompat" | 3650 INSTALL_COMPAT="installcompat" |
3661 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" | 3651 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" |
3662 else | 3652 else |
3663 COMPAT_OBJECT="" | 3653 COMPAT_OBJECT="" |
3664 INSTALL_COMPAT="" | 3654 INSTALL_COMPAT="" |
3665 SYSCONF_LINK_TARGET_SHARED2="" | 3655 SYSCONF_LINK_TARGET_SHARED2="" |
3666 fi | 3656 fi |
3667 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" | 3657 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" |
3668 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" | 3658 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" |
3669 | 3659 |
3670 | 3660 |
3671 # Check whether --with-gtk was given. | 3661 # Check whether --with-gtk was given. |
3672 if test "${with_gtk+set}" = set; then : | 3662 if test "${with_gtk+set}" = set; then : |
4597 *mingw32) | 4587 *mingw32) |
4598 $as_echo "#define DW_USE_GTK 1" >>confdefs.h | 4588 $as_echo "#define DW_USE_GTK 1" >>confdefs.h |
4599 | 4589 |
4600 ;; | 4590 ;; |
4601 *linux*) | 4591 *linux*) |
4602 SONAME="-Wl,-soname,lib$TARGET.so.$DW_MAJOR_VERSION" | 4592 SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" |
4603 ;; | 4593 ;; |
4604 *nto-qnx*) | 4594 *nto-qnx*) |
4605 DW_DIR="photon" | 4595 DW_DIR="photon" |
4606 DW_DEFINE=__PHOTON__ | 4596 DW_DEFINE=__PHOTON__ |
4607 build_gtk="no" | 4597 build_gtk="no" |
4631 ARCH="-arch ppc -arch i386" | 4621 ARCH="-arch ppc -arch i386" |
4632 ;; | 4622 ;; |
4633 64bit) | 4623 64bit) |
4634 ARCH="-arch ppc64 -arch x86_64" | 4624 ARCH="-arch ppc64 -arch x86_64" |
4635 ;; | 4625 ;; |
4626 intel) | |
4627 ARCH="-arch i386 -arch x86_64" | |
4628 ;; | |
4636 *) | 4629 *) |
4637 ARCH="-arch $with_arch" | 4630 ARCH="-arch $with_arch" |
4638 ;; | 4631 ;; |
4639 esac | 4632 esac |
4640 SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress" | 4633 SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress -headerpad_max_install_names" |
4641 SOSUFFIX=dylib | 4634 SOSUFFIX=dylib |
4642 if test $with_gtkframework = yes; then | 4635 if test $with_gtkframework = yes; then |
4643 DW_DIR=gtk | 4636 DW_DIR=gtk |
4644 LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo" | 4637 LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo" |
4645 GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers" | 4638 GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers" |