Mercurial > dwindows
changeset 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 | 94ea915bd917 |
files | configure configure.in |
diffstat | 2 files changed, 41 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Jun 03 18:38:26 2020 +0000 +++ b/configure Fri Jun 05 06:00:17 2020 +0000 @@ -3678,18 +3678,6 @@ fi -if test $with_dwcompat = yes; then - COMPAT_OBJECT="dwcompat.o" - INSTALL_COMPAT="installdwcompat" - SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" -else - COMPAT_OBJECT="" - INSTALL_COMPAT="" - SYSCONF_LINK_TARGET_SHARED2="" -fi -SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" -SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" - # Check whether --with-arch was given. if test "${with_arch+set}" = set; then : @@ -4612,7 +4600,6 @@ build_gtk="yes" check_pthreads="yes" -TARGETS="$SYSCONF_LINK_TARGET_SHARED $SYSCONF_LINK_TARGET_SHARED2" PLATLIBS="" SONAME="" PLATCCFLAGS="-g -O2 -fPIC -Wall" @@ -4628,24 +4615,6 @@ *linux*) SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" ;; - *nto-qnx*) - DW_DIR="photon" - DW_DEFINE=__PHOTON__ - build_gtk="no" - ;; - *qnx*) - DW_DIR="photon" - DW_DEFINE=__PHOTON__ - build_gtk="no" - check_pthreads="no" - LIBSUFFIX="lib" - LIBPREFIX="" - SYSCONF_LINK_TARGET_STATIC="$TARGET.lib" - TARGETS="$TARGET.lib" - PLATCCFLAGS="" - PLATLIBS="-lphoton_s -lphexlib3r" - ARFLAGS="r" - ;; *apple-darwin*) case "$with_arch" in no) @@ -4676,16 +4645,35 @@ DW_SRC=dw.m DW_DEFINE=__MAC__ LIBS="$LIBS -framework Cocoa -framework WebKit" - OSVER=`uname -r | cut -d. -f1` - if test $OSVER -ge "18"; then - LIBS="$LIBS -framework UserNotifications" - fi + save_libs="$LIBS" + LIBS="$LIBS -framework UserNotifications" + ac_fn_c_check_func "$LINENO" "exit" "ac_cv_func_exit" +if test "x$ac_cv_func_exit" = xyes; then : + +else + LIBS="$save_libs" +fi + build_gtk="no" ;; *) ;; esac +if test $with_dwcompat = yes; then + COMPAT_OBJECT="dwcompat.o" + INSTALL_COMPAT="installdwcompat" + SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" +else + COMPAT_OBJECT="" + INSTALL_COMPAT="" + SYSCONF_LINK_TARGET_SHARED2="" +fi +SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" +SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" + +TARGETS="$SYSCONF_LINK_TARGET_SHARED $SYSCONF_LINK_TARGET_SHARED2" + if test $build_gtk = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; }
--- a/configure.in Wed Jun 03 18:38:26 2020 +0000 +++ b/configure.in Fri Jun 05 06:00:17 2020 +0000 @@ -62,19 +62,6 @@ [with_deprecated=no], ) -dnl ---------------------- default targets to build ----------------- -if test $with_dwcompat = yes; then - COMPAT_OBJECT="dwcompat.o" - INSTALL_COMPAT="installdwcompat" - SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" -else - COMPAT_OBJECT="" - INSTALL_COMPAT="" - SYSCONF_LINK_TARGET_SHARED2="" -fi -SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" -SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" - dnl ---------------------- check for '--with-arch' switch ----------------- AC_ARG_WITH(arch, [ --with-arch specify architecture: one of all, 32bit, 64bit, intel, ppc, ppc64, x86_64, i386], @@ -113,7 +100,6 @@ build_gtk="yes" check_pthreads="yes" -TARGETS="$SYSCONF_LINK_TARGET_SHARED $SYSCONF_LINK_TARGET_SHARED2" PLATLIBS="" SONAME="" PLATCCFLAGS="-g -O2 -fPIC -Wall" @@ -128,24 +114,6 @@ *linux*) SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" ;; - *nto-qnx*) - DW_DIR="photon" - DW_DEFINE=__PHOTON__ - build_gtk="no" - ;; - *qnx*) - DW_DIR="photon" - DW_DEFINE=__PHOTON__ - build_gtk="no" - check_pthreads="no" - LIBSUFFIX="lib" - LIBPREFIX="" - SYSCONF_LINK_TARGET_STATIC="$TARGET.lib" - TARGETS="$TARGET.lib" - PLATCCFLAGS="" - PLATLIBS="-lphoton_s -lphexlib3r" - ARFLAGS="r" - ;; *apple-darwin*) case "$with_arch" in no) @@ -176,16 +144,30 @@ DW_SRC=dw.m DW_DEFINE=__MAC__ LIBS="$LIBS -framework Cocoa -framework WebKit" - OSVER=`uname -r | cut -d. -f1` - if test $OSVER -ge "18"; then - LIBS="$LIBS -framework UserNotifications" - fi + save_libs="$LIBS" + LIBS="$LIBS -framework UserNotifications" + AC_CHECK_FUNC(exit, , [LIBS="$save_libs"]) build_gtk="no" ;; *) ;; esac +dnl ---------------------- default targets to build ----------------- +if test $with_dwcompat = yes; then + COMPAT_OBJECT="dwcompat.o" + INSTALL_COMPAT="installdwcompat" + SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" +else + COMPAT_OBJECT="" + INSTALL_COMPAT="" + SYSCONF_LINK_TARGET_SHARED2="" +fi +SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" +SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" + +TARGETS="$SYSCONF_LINK_TARGET_SHARED $SYSCONF_LINK_TARGET_SHARED2" + if test $build_gtk = "yes"; then AC_PATH_XTRA LIBS="$LIBS $X_LIBS -lX11"