diff options
| author | Diane Bruce <db@FreeBSD.org> | 2013-12-28 22:18:48 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2013-12-28 22:18:48 +0000 |
| commit | f4f040963dd13d8d3ff8480b8c68140affa48e6a (patch) | |
| tree | b83459bd94a65382ae5a3e8c8db337a5e5166aa6 /comms/unixcw/files/patch-configure.ac | |
| parent | - Enable stage support (diff) | |
- Use distribution from sourceforge which updates us to 3.2.0
- This unbreaks unixcw on QT4
- Use stage
- Add LICENSE
Diffstat (limited to 'comms/unixcw/files/patch-configure.ac')
| -rw-r--r-- | comms/unixcw/files/patch-configure.ac | 58 |
1 files changed, 11 insertions, 47 deletions
diff --git a/comms/unixcw/files/patch-configure.ac b/comms/unixcw/files/patch-configure.ac index a362169195e6..112cfd44c63b 100644 --- a/comms/unixcw/files/patch-configure.ac +++ b/comms/unixcw/files/patch-configure.ac @@ -1,47 +1,11 @@ ---- configure.ac.orig 2006-07-13 01:31:21.000000000 -0400 -+++ configure.ac 2007-12-28 15:31:58.000000000 -0500 -@@ -18,11 +18,10 @@ - # - - # General initializations. --AC_PREREQ(2.57) -+AC_PREREQ(%%AUTOCONF_VERSION%%) - AC_INIT([UnixCW], 2.3, [simon_baldwin@yahoo.com]) -- - # Specify a configuration header. --AC_CONFIG_HEADERS(src/config.h) -+AC_CONFIG_HEADER(src/config.h) - - # General checks for programs. - AC_PROG_CC -@@ -48,6 +47,7 @@ - - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+AC_CHECK_LIB(intl, gettext) - - # Checks for header files, and refuse to go on if no KIOCSOUND is available. - AC_HEADER_STDC -@@ -136,7 +136,12 @@ - AC_MSG_WARN([Hint: try setting a value for the QTDIR variable]) - fi - AC_SUBST(SUBDIRS) -- -+if test -n "$QTLIB" ; then -+ QTLIBR=$QTLIB -+else -+ QTLIBR="qt" -+fi -+AC_SUBST(QTLIBR) - # Add -Wall, -W, -pedantic, and other paranoia to gcc command flags, and -Wall - # to with a few suppressions to icc command flags, then similarly, though less - # so, for g++ and icpc. -@@ -200,6 +205,8 @@ - fi - fi - rm -f conftest.so -+dnl fake it here for now -+ CC_LINKS_SO="yes" - if test $CC_LINKS_SO = "yes" ; then - AC_MSG_RESULT(yes) - else +--- configure.ac.orig 2013-07-16 21:37:30.000000000 -0500 ++++ configure.ac 2013-07-16 21:37:49.000000000 -0500 +@@ -292,7 +292,7 @@ + # autodetection of Qt4 dependencies + m4_include([configure.qt.inc]) + +- if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then ++ if [[ "$QT4INC" -a "$QT4MOC" ]] ; then + # we have moc4 and path to Qt4 include files, + # so we can build xcwcp + WITH_XCWCP='yes' |