← Back to branch summary

~cmiller/ubuntu/trusty/icewm/translations-cause-crash-lp447883

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Eduard Bloch
  • Date: 2008-03-10 21:24:25 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080310212425-562btgm3vbwzvhu0
Tags: 1.2.35-1
http://bugs.debian.org/360060
http://bugs.debian.org/319191
http://bugs.debian.org/349952
http://bugs.debian.org/456463
http://bugs.debian.org/428566
http://bugs.debian.org/389919
http://bugs.debian.org/459181
* New upstream release with one fix from CVS
* Automatic linking with gcc -lsupc++ fixed (failed in recent versions),
  also using "-Wl,--as-needed"
* Documentation update - README.Debian reordered by importance
* Changed font defaults in Xft specifications to consider Bitstream Vera
  family as alternative font (closes: #360060, #319191, #349952, #456463),
  also documented how to configure alternative fonts
* Added Bernhard's iconify_on_wm_hints as dpatch (closes: #428566, #389919)
* force use of bash in upstream's Makefile to keep the installation
  magic as-is (closes: #459181)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
77
77
 
78
78
AC_SUBST(CXX_LINK)
79
79
 
 
80
if test x"$HOSTCXX" = x; then
 
81
  HOSTCXX=$CXX
 
82
fi
 
83
 
 
84
AC_SUBST(HOSTCXX)
 
85
 
 
86
if test x"$HOSTCXX_LINK" = x; then
 
87
  HOSTCXX_LINK=$CXX
 
88
fi
 
89
 
 
90
AC_SUBST(HOSTCXX_LINK)
 
91
 
80
92
#this test is broken, because AC_TRY_LINK calls g++
81
93
#AC_MSG_CHECKING([if we need our own C++ allocation operators])
82
94
#AC_TRY_LINK([ void icewm_alloc() {
99
111
AC_CHECK_HEADERS(sched.h sys/dkstat.h sys/param.h sys/sysctl.h uvm/uvm_param.h)
100
112
 
101
113
AC_CHECK_HEADERS(libgen.h)      dnl --  basename() for FreeBSD
 
114
AC_CHECK_HEADERS(machine/apmvar.h)
 
115
AC_CHECK_HEADERS(machine/apm_bios.h)
102
116
 
103
117
AC_CHECK_HEADERS(kstat.h,
104
118
  [ CORE_LIBS="${CORE_LIBS} -lkstat"
427
441
  fi
428
442
  if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then
429
443
    AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
430
 
    if test "${XFT_CONFIG}" == ""; then
 
444
    if test "${XFT_CONFIG}" = ""; then
431
445
      AC_PATH_PROG(PKG_CONFIG, pkg-config)
432
446
      if test "${PKG_CONFIG}" != ""; then
433
447
        ${PKG_CONFIG} xft 2>/dev/null
883
897
 
884
898
for binary in ${APPLICATIONS}; do
885
899
  BASEOBJS="${BASEOBJS} \$(${binary}_OBJS)"
886
 
  BASEBINS="${BASEBINS} ${binary}"
 
900
  BASEBINS="${BASEBINS} ${binary}\$(EXEEXT)"
887
901
done
888
902
 
889
903
AC_SUBST(BASEOBJS)
894
908
 
895
909
for binary in ${TESTCASES}; do
896
910
  TESTOBJS="${TESTOBJS} \$(${binary}_OBJS)"
897
 
  TESTBINS="${TESTBINS} ${binary}"
 
911
  TESTBINS="${TESTBINS} ${binary}\$(EXEEXT)"
898
912
done
899
913
 
900
914
AC_SUBST(TESTOBJS)
902
916
 
903
917
dnl -------------------------------------------------------- Install targets ---
904
918
TARGETS_INSTALL=`for target in ${TARGETS}; do echo $ECHO_N "install-${target} $ECHO_C"; done`
905
 
BINFILES=`for binary in ${APPLICATIONS}; do echo $ECHO_N "\\\$(top_srcdir)/src/${binary} $ECHO_C"; done`
 
919
BINFILES=`for binary in ${APPLICATIONS}; do echo $ECHO_N "\\\$(top_srcdir)/src/${binary}\\\$(EXEEXT) $ECHO_C"; done`
906
920
 
907
921
AC_SUBST(TARGETS)
908
922
AC_SUBST(TARGETS_INSTALL)
920
934
dnl --------------------------------------------------------- Generate files ---
921
935
AC_CONFIG_COMMANDS(config.status, [
922
936
    for binary in ${ac_targets_binaries}; do
923
 
      echo "${binary}: \$(${binary}_OBJS)" >> "${srcdir}/src/Makefile"
 
937
      echo "${binary}\$(EXEEXT): \$(${binary}_OBJS)" >> "${srcdir}/src/Makefile"
924
938
    done
925
939
    
926
940
    if test "${ac_depend}" = "yes"; then
927
941
      echo >> "${srcdir}/src/Makefile"
928
942
      echo '-include $(OBJECTS:.o=.d)' >> "${srcdir}/src/Makefile"
 
943
      echo '-include $(genpref_OBJS:.o=.d)' >> "${srcdir}/src/Makefile"
929
944
    fi
930
945
],[
931
946
    ac_targets_binaries="${APPLICATIONS} ${TESTCASES}"