[avahi-tqt][master,r14.0.x] 62ccf610,ba4d4f41

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt

index d77d4e9..eb3778d 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -85,7 +85,7 @@

 string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}"

         includedir ${INCLUDE_INSTALL_DIR} )

-configure_file( ${CMAKE_PROJECT_NAME}.pc.in ${CMAKE_PROJECT_NAME}.pc @ONLY )

+configure_file( ${CMAKE_PROJECT_NAME}.pc.cmake ${CMAKE_PROJECT_NAME}.pc @ONLY )

 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.pc

          DESTINATION ${PKGCONFIG_INSTALL_DIR} )

Makefile.am

diff --git a/Makefile.am b/Makefile.am

deleted file mode 100644

index 242b69e..0000000

--- a/Makefile.am

+++ /dev/null

@@ -1,53 +0,0 @@

-# This file is part of avahi.

-#

-# avahi is free software; you can redistribute it and/or modify it

-# under the terms of the GNU Lesser General Public License as

-# published by the Free Software Foundation; either version 2 of the

-# License, or (at your option) any later version.

-#

-# avahi is distributed in the hope that it will be useful, but WITHOUT

-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY

-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public

-# License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with avahi; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307

-# USA.

-ACLOCAL_AMFLAGS = -I common

-include $(srcdir)/common/doxygen.mk

-EXTRA_DIST = \

-	autogen.sh \

-	bootstrap.sh \

-	LICENSE \

-	avahi-tqt.pc.in \

-        common/introspection.m4

-SUBDIRS = \

-	avahi-tqt

-DX_EXAMPLE_PATH = $(srcdir)/examples

-DX_EXAMPLE_PATTERNS = *.c

-DX_INPUT = \

-	$(srcdir)/avahi-tqt/qt-watch.h

-pkgconfigdir = $(libdir)/pkgconfig

-%.pc: %.pc.in

-	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \

-	    -e 's,@libdir\@,$(libdir),g' \

-	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \

-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@

-pkgconfig_DATA = avahi-tqt.pc

-CLEANFILES = avahi-tqt.pc

-DISTCHECK_CONFIGURE_FLAGS = \

-	--disable-monodoc \

-	--enable-introspection \

-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)

acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4

deleted file mode 100644

index 4d07999..0000000

--- a/acinclude.m4

+++ /dev/null

@@ -1 +0,0 @@

-sinclude(common/doxygen.m4)

\ No newline at end of file

aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4

deleted file mode 100644

index b2ae2a7..0000000

--- a/aclocal.m4

+++ /dev/null

@@ -1,1198 +0,0 @@

-# generated automatically by aclocal 1.11 -*- Autoconf -*-

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.

-# This file is free software; the Free Software Foundation

-# gives unlimited permission to copy and/or distribute it,

-# with or without modifications, as long as this notice is preserved.

-# This program is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without

-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

-# PARTICULAR PURPOSE.

-m4_ifndef([AC_AUTOCONF_VERSION],

-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,

-[m4_warning([this file was generated for autoconf 2.63.

-You have another version of autoconf.  It may work, but is not guaranteed to.

-If you have problems, you may need to regenerate the build system entirely.

-To do so, use the procedure documented by the package, typically `autoreconf'.])])

-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-

-# serial 1 (pkg-config-0.24)

-#

-# Copyright © 2004 Scott James Remnant <scott@...>.

-#

-# This program is free software; you can redistribute it and/or modify

-# it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or

-# (at your option) any later version.

-#

-# This program is distributed in the hope that it will be useful, but

-# WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-# General Public License for more details.

-#

-# You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-#

-# As a special exception to the GNU General Public License, if you

-# distribute this file as part of a program that contains a

-# configuration script generated by Autoconf, you may include it under

-# the same distribution terms that you use for the rest of that program.

-# PKG_PROG_PKG_CONFIG([MIN-VERSION])

-# ----------------------------------

-AC_DEFUN([PKG_PROG_PKG_CONFIG],

-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])

-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])

-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])

-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])

-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])

-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

-fi

-if test -n "$PKG_CONFIG"; then

-	_pkg_min_version=m4_default([$1], [0.9.0])

-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])

-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

-		AC_MSG_RESULT([yes])

-	else

-		AC_MSG_RESULT([no])

-		PKG_CONFIG=""

-	fi

-fi[]dnl

-])# PKG_PROG_PKG_CONFIG

-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

-#

-# Check to see whether a particular set of modules exists.  Similar

-# to PKG_CHECK_MODULES(), but does not set variables or print errors.

-#

-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])

-# only at the first occurence in configure.ac, so if the first place

-# it's called might be skipped (such as if it is within an "if", you

-# have to call PKG_CHECK_EXISTS manually

-# --------------------------------------------------------------

-AC_DEFUN([PKG_CHECK_EXISTS],

-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

-if test -n "$PKG_CONFIG" && \

-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then

-  m4_default([$2], [:])

-m4_ifvaln([$3], [else

-  $3])dnl

-fi])

-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

-# ---------------------------------------------

-m4_define([_PKG_CONFIG],

-[if test -n "$$1"; then

-    pkg_cv_[]$1="$$1"

- elif test -n "$PKG_CONFIG"; then

-    PKG_CHECK_EXISTS([$3],

-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

-		     [pkg_failed=yes])

- else

-    pkg_failed=untried

-fi[]dnl

-])# _PKG_CONFIG

-# _PKG_SHORT_ERRORS_SUPPORTED

-# -----------------------------

-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],

-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])

-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

-        _pkg_short_errors_supported=yes

-else

-        _pkg_short_errors_supported=no

-fi[]dnl

-])# _PKG_SHORT_ERRORS_SUPPORTED

-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],

-# [ACTION-IF-NOT-FOUND])

-#

-#

-# Note that if there is a possibility the first call to

-# PKG_CHECK_MODULES might not happen, you should be sure to include an

-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac

-#

-#

-# --------------------------------------------------------------

-AC_DEFUN([PKG_CHECK_MODULES],

-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl

-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl

-pkg_failed=no

-AC_MSG_CHECKING([for $1])

-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])

-_PKG_CONFIG([$1][_LIBS], [libs], [$2])

-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS

-and $1[]_LIBS to avoid the need to call pkg-config.

-See the pkg-config man page for more details.])

-if test $pkg_failed = yes; then

-   	AC_MSG_RESULT([no])

-        _PKG_SHORT_ERRORS_SUPPORTED

-        if test $_pkg_short_errors_supported = yes; then

-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`

-        else

-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`

-        fi

-	# Put the nasty error message in config.log where it belongs

-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

-	m4_default([$4], [AC_MSG_ERROR(

-[Package requirements ($2) were not met:

-$$1_PKG_ERRORS

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

-installed software in a non-standard prefix.

-_PKG_TEXT])dnl

-        ])

-elif test $pkg_failed = untried; then

-     	AC_MSG_RESULT([no])

-	m4_default([$4], [AC_MSG_FAILURE(

-[The pkg-config script could not be found or is too old.  Make sure it

** Diff limit reached (max: 250 lines) **

62ccf610	2019-06-08 14:59:02	Michele Calgaro
Removed unused autotools files and changed file names to conform to .cmake convention for configuration files. Signed-off-by: Michele Calgaro <michele.calgaro@...>
A avahi-tqt.pc.cmake M CMakeLists.txt R Makefile.am R acinclude.m4 R aclocal.m4 R autogen.sh R avahi-tqt.pc.in R avahi-tqt/Makefile.am R common/ChangeLog R common/Makefile.am R common/Makefile.in R common/acx_pthread.m4 R common/doxygen.m4 R common/doxygen.mk R common/gcc_stack_protect.m4 R common/gcc_visibility.m4 R common/gettext.m4 R common/iconv.m4 R common/introspection.m4 R common/lib-ld.m4 R common/lib-link.m4 R common/lib-prefix.m4 R common/libtool.m4 R common/ltoptions.m4 R common/ltsugar.m4 R common/ltversion.m4 R common/lt~obsolete.m4 R common/nls.m4 R common/po.m4 R common/progtest.m4 R common/python.m4 R compile R config.guess R config.h.in R config.rpath R config.sub R configure.ac R depcomp R ltmain.sh R missing
CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index d77d4e9..eb3778d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" includedir ${INCLUDE_INSTALL_DIR} ) -configure_file( ${CMAKE_PROJECT_NAME}.pc.in ${CMAKE_PROJECT_NAME}.pc @ONLY ) +configure_file( ${CMAKE_PROJECT_NAME}.pc.cmake ${CMAKE_PROJECT_NAME}.pc @ONLY ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} ) Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 242b69e..0000000 --- a/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# This file is part of avahi. -# -# avahi is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# avahi is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -# License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with avahi; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -ACLOCAL_AMFLAGS = -I common - -include $(srcdir)/common/doxygen.mk - -EXTRA_DIST = \ - autogen.sh \ - bootstrap.sh \ - LICENSE \ - avahi-tqt.pc.in \ - common/introspection.m4 - -SUBDIRS = \ - avahi-tqt - -DX_EXAMPLE_PATH = $(srcdir)/examples -DX_EXAMPLE_PATTERNS = .c - -DX_INPUT = \ - $(srcdir)/avahi-tqt/qt-watch.h - - -pkgconfigdir = $(libdir)/pkgconfig - -%.pc: %.pc.in - $(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \ - -e 's,@libdir\@,$(libdir),g' \ - -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \ - -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@ - -pkgconfig_DATA = avahi-tqt.pc -CLEANFILES = avahi-tqt.pc - -DISTCHECK_CONFIGURE_FLAGS = \ - --disable-monodoc \ - --enable-introspection \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 4d07999..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1 +0,0 @@ -sinclude(common/doxygen.m4) \ No newline at end of file aclocal.m4 diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index b2ae2a7..0000000 --- a/aclocal.m4 +++ /dev/null @@ -1,1198 +0,0 @@ -# generated automatically by aclocal 1.11 -- Autoconf -- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf -- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott@...>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it * Diff limit reached (max: 250 lines) **

Branch: master

CMakeLists.txt

Makefile.am

acinclude.m4

aclocal.m4