Mercurial > dwindows
comparison configure @ 2087:082d743f3214
Reorder configure so SOSUFFIX is only used after it is set per platform.
Remove newly broken QNX/Photon support from configure.
Mac: Attempt a new test for the UserNotifications framework.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 05 Jun 2020 06:00:17 +0000 |
parents | 498bdd71a556 |
children | 068681933258 |
comparison
equal
deleted
inserted
replaced
2086:498bdd71a556 | 2087:082d743f3214 |
---|---|
3676 else | 3676 else |
3677 with_deprecated=no | 3677 with_deprecated=no |
3678 fi | 3678 fi |
3679 | 3679 |
3680 | 3680 |
3681 if test $with_dwcompat = yes; then | |
3682 COMPAT_OBJECT="dwcompat.o" | |
3683 INSTALL_COMPAT="installdwcompat" | |
3684 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" | |
3685 else | |
3686 COMPAT_OBJECT="" | |
3687 INSTALL_COMPAT="" | |
3688 SYSCONF_LINK_TARGET_SHARED2="" | |
3689 fi | |
3690 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" | |
3691 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" | |
3692 | |
3693 | 3681 |
3694 # Check whether --with-arch was given. | 3682 # Check whether --with-arch was given. |
3695 if test "${with_arch+set}" = set; then : | 3683 if test "${with_arch+set}" = set; then : |
3696 withval=$with_arch; with_arch=$withval | 3684 withval=$with_arch; with_arch=$withval |
3697 else | 3685 else |
4610 fi | 4598 fi |
4611 | 4599 |
4612 | 4600 |
4613 build_gtk="yes" | 4601 build_gtk="yes" |
4614 check_pthreads="yes" | 4602 check_pthreads="yes" |
4615 TARGETS="$SYSCONF_LINK_TARGET_SHARED $SYSCONF_LINK_TARGET_SHARED2" | |
4616 PLATLIBS="" | 4603 PLATLIBS="" |
4617 SONAME="" | 4604 SONAME="" |
4618 PLATCCFLAGS="-g -O2 -fPIC -Wall" | 4605 PLATCCFLAGS="-g -O2 -fPIC -Wall" |
4619 ARFLAGS="cqs" | 4606 ARFLAGS="cqs" |
4620 | 4607 |
4625 $as_echo "#define DW_USE_GTK 1" >>confdefs.h | 4612 $as_echo "#define DW_USE_GTK 1" >>confdefs.h |
4626 | 4613 |
4627 ;; | 4614 ;; |
4628 *linux*) | 4615 *linux*) |
4629 SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" | 4616 SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" |
4630 ;; | |
4631 *nto-qnx*) | |
4632 DW_DIR="photon" | |
4633 DW_DEFINE=__PHOTON__ | |
4634 build_gtk="no" | |
4635 ;; | |
4636 *qnx*) | |
4637 DW_DIR="photon" | |
4638 DW_DEFINE=__PHOTON__ | |
4639 build_gtk="no" | |
4640 check_pthreads="no" | |
4641 LIBSUFFIX="lib" | |
4642 LIBPREFIX="" | |
4643 SYSCONF_LINK_TARGET_STATIC="$TARGET.lib" | |
4644 TARGETS="$TARGET.lib" | |
4645 PLATCCFLAGS="" | |
4646 PLATLIBS="-lphoton_s -lphexlib3r" | |
4647 ARFLAGS="r" | |
4648 ;; | 4617 ;; |
4649 *apple-darwin*) | 4618 *apple-darwin*) |
4650 case "$with_arch" in | 4619 case "$with_arch" in |
4651 no) | 4620 no) |
4652 ARCH="" | 4621 ARCH="" |
4674 SOSUFFIX=dylib | 4643 SOSUFFIX=dylib |
4675 DW_DIR=mac | 4644 DW_DIR=mac |
4676 DW_SRC=dw.m | 4645 DW_SRC=dw.m |
4677 DW_DEFINE=__MAC__ | 4646 DW_DEFINE=__MAC__ |
4678 LIBS="$LIBS -framework Cocoa -framework WebKit" | 4647 LIBS="$LIBS -framework Cocoa -framework WebKit" |
4679 OSVER=`uname -r | cut -d. -f1` | 4648 save_libs="$LIBS" |
4680 if test $OSVER -ge "18"; then | 4649 LIBS="$LIBS -framework UserNotifications" |
4681 LIBS="$LIBS -framework UserNotifications" | 4650 ac_fn_c_check_func "$LINENO" "exit" "ac_cv_func_exit" |
4682 fi | 4651 if test "x$ac_cv_func_exit" = xyes; then : |
4652 | |
4653 else | |
4654 LIBS="$save_libs" | |
4655 fi | |
4656 | |
4683 build_gtk="no" | 4657 build_gtk="no" |
4684 ;; | 4658 ;; |
4685 *) | 4659 *) |
4686 ;; | 4660 ;; |
4687 esac | 4661 esac |
4662 | |
4663 if test $with_dwcompat = yes; then | |
4664 COMPAT_OBJECT="dwcompat.o" | |
4665 INSTALL_COMPAT="installdwcompat" | |
4666 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" | |
4667 else | |
4668 COMPAT_OBJECT="" | |
4669 INSTALL_COMPAT="" | |
4670 SYSCONF_LINK_TARGET_SHARED2="" | |
4671 fi | |
4672 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" | |
4673 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" | |
4674 | |
4675 TARGETS="$SYSCONF_LINK_TARGET_SHARED $SYSCONF_LINK_TARGET_SHARED2" | |
4688 | 4676 |
4689 if test $build_gtk = "yes"; then | 4677 if test $build_gtk = "yes"; then |
4690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 | 4678 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 |
4691 $as_echo_n "checking for X... " >&6; } | 4679 $as_echo_n "checking for X... " >&6; } |
4692 | 4680 |