From b8b206c6e84757c6d4d36cec619a1e7c37d1eb5f Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 10 Feb 2021 13:06:05 +0100 Subject: Move source files to src --- configure.ac | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 95398ec..9ba72ec 100644 --- a/configure.ac +++ b/configure.ac @@ -146,17 +146,17 @@ PKG_CHECK_MODULES(SYSTEMD, systemd, [] ) if test "x$has_systemd" = "xyes"; then - SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` - AC_SUBST(SYSTEMD_USERDIR) - AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicators-pre.target for systemd]) + SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` + AC_SUBST(SYSTEMD_USERDIR) + AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicators-pre.target for systemd]) fi ######################### # Check if build tests ######################### AC_ARG_ENABLE([tests], - AC_HELP_STRING([--disable-tests], [disable tests]),, - [enable_tests=yes]) + AC_HELP_STRING([--disable-tests], [disable tests]),, + [enable_tests=yes]) AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) ######################### @@ -167,8 +167,8 @@ AC_ARG_ENABLE([debug], [enable_debug=no]) if test "x$enable_debug" = "xyes"; then - CFLAGS="-g $CFLAGS" - AC_DEFINE(ENABLE_DEBUG, 1, [build with extra debug information]) + CFLAGS="-g $CFLAGS" + AC_DEFINE(ENABLE_DEBUG, 1, [build with extra debug information]) fi AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") @@ -192,9 +192,9 @@ AC_SUBST(COVERAGE_LDFLAGS) AC_CONFIG_FILES([ Makefile data/Makefile -libayatana-indicator/Makefile -libayatana-indicator/ayatana-indicator-0.4.pc.in -libayatana-indicator/ayatana-indicator3-0.4.pc.in +src/Makefile +src/ayatana-indicator-0.4.pc.in +src/ayatana-indicator3-0.4.pc.in tests/Makefile tools/Makefile ]) @@ -208,11 +208,11 @@ AC_MSG_NOTICE([ Libindicator Configuration: - Prefix: $prefix - GTK+ Version: $with_gtk - - Enable IDO loader: $enable_ido - Enable tests: $enable_tests - Enable debugging: $enable_debug - Coverage reporting: $use_gcov + Prefix: $prefix + GTK+ Version: $with_gtk + + Enable IDO loader: $enable_ido + Enable tests: $enable_tests + Enable debugging: $enable_debug + Coverage reporting: $use_gcov ]) -- cgit v1.2.3 From e20daf604e81ebd473c74dedda725bca27cd8dd1 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 11 Feb 2021 15:29:17 +0100 Subject: Remove Automake-related files --- configure.ac | 218 ----------------------------------------------------------- 1 file changed, 218 deletions(-) delete mode 100644 configure.ac (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 9ba72ec..0000000 --- a/configure.ac +++ /dev/null @@ -1,218 +0,0 @@ -AC_INIT([libayatana-indicator], - [0.8.4], - [https://github.com/ArcticaProject/libayatana-indicator/issues], - [libayatana-indicator], - [https://github.com/ArcticaProject/libayatana-indicator]) - -AC_PREREQ([2.64]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_SUBST([ac_aux_dir]) - -AM_INIT_AUTOMAKE([1.11 -Wall tar-pax]) - -AM_MAINTAINER_MODE([enable]) - -AM_SILENT_RULES([yes]) - -# Check for programs -AC_PROG_CC -AM_PROG_CC_C_O -AM_PROG_AR - -# Initialize libtool -LT_PREREQ([2.2]) -LT_INIT - -# Upstream's pkg.m4 (since 0.27) offers this now, but define our own -# compatible version in case the local version of pkgconfig isn't new enough. -# https://bugs.freedesktop.org/show_bug.cgi?id=48743 -m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], - [AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], - [install directory for nx-x11.pc pkg-config file])], - [],[with_pkgconfigdir='$(libdir)/pkgconfig']) - AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])]) - -# Required when PKG_CHECK_MODULES called within an if statement -PKG_PROG_PKG_CONFIG - - -AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) - - -AC_ARG_ENABLE([deprecations], - [AS_HELP_STRING([--enable-deprecations], - [allow deprecated API usage @<:@default=yes@:>@])], - [], - [enable_deprecations=yes]) -AS_IF([test "x$enable_deprecations" = xno], - [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] -) - -AC_ARG_ENABLE([ido], - [AS_HELP_STRING([--enable-ido], - [enable indicator widget loader @<:@default=yes@:>@])], - [], - [enable_ido=yes]) - -############################## -# Dependencies -############################## - -GTK_REQUIRED_VERSION=2.18 -GTK3_REQUIRED_VERSION=3.6 -GIO_UNIX_REQUIRED_VERSION=2.37 -IDO_REQUIRED_VERSION=0.8.0 - - -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=3@:>@])], - [], - [with_gtk=3]) -AS_IF([test "x$with_gtk" = x3], - [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gmodule-2.0 - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) - AS_IF([test "x$enable_ido" = xyes], [ - PKG_CHECK_MODULES(LIBINDICATOR_IDO, libayatana-ido3-0.4 >= $IDO_REQUIRED_VERSION) - ]) - ], - [test "x$with_gtk" = x2], - [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION - gmodule-2.0 - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) - ], - [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] -) - -AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) -AM_CONDITIONAL(USE_IDO, [test "$enable_ido" = "yes"]) - -LT_LIB_M -AC_SUBST(LIBM) - -############################## -# Custom Junk -############################## - -AC_DEFUN([AC_DEFINE_PATH], [ - test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_path=`eval echo [$]$2` - ac_define_path=`eval echo [$]ac_define_path` - $1="$ac_define_path" - AC_SUBST($1) - ifelse($3, , - AC_DEFINE_UNQUOTED($1, "$ac_define_path"), - AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3)) -]) - -############################## -# ./configure Flags messings -############################## - -cflags_set=${CFLAGS+set} -# find the actual value for $prefix that we'll end up with -REAL_PREFIX= -if test "x$prefix" = "xNONE"; then - REAL_PREFIX=$ac_default_prefix -else - REAL_PREFIX=$prefix -fi - -# Have to go $sysconfdir->$prefix/etc->/usr/local/etc -# if you actually know how to code shell then fix this :-) -SYSCONFDIR_TMP="$sysconfdir" -old_prefix=$prefix -prefix=$REAL_PREFIX -EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP` -prefix=$old_prefix -AC_SUBST(EXPANDED_SYSCONFDIR) - -AC_DEFINE_PATH(PREFIX, "${prefix}", [prefix directory]) -AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir]) -AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) - -######################### -# Check for systemd -######################### -PKG_CHECK_MODULES(SYSTEMD, systemd, - [has_systemd=yes], - [] -) -if test "x$has_systemd" = "xyes"; then - SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` - AC_SUBST(SYSTEMD_USERDIR) - AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicators-pre.target for systemd]) -fi - -######################### -# Check if build tests -######################### -AC_ARG_ENABLE([tests], - AC_HELP_STRING([--disable-tests], [disable tests]),, - [enable_tests=yes]) -AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) - -######################### -# Debug symbols -######################### -AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug],[build with debug symbols]),, - [enable_debug=no]) - -if test "x$enable_debug" = "xyes"; then - CFLAGS="-g $CFLAGS" - AC_DEFINE(ENABLE_DEBUG, 1, [build with extra debug information]) -fi - -AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") - -########################### -# gcov coverage reporting -########################### -m4_include([m4/gcov.m4]) -AC_TDD_GCOV -AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) -AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) -AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) -AC_SUBST(COVERAGE_CFLAGS) -AC_SUBST(COVERAGE_CXXFLAGS) -AC_SUBST(COVERAGE_LDFLAGS) - -########################### -# Files -########################### - -AC_CONFIG_FILES([ -Makefile -data/Makefile -src/Makefile -src/ayatana-indicator-0.4.pc.in -src/ayatana-indicator3-0.4.pc.in -tests/Makefile -tools/Makefile -]) -AC_OUTPUT - -########################### -# Results -########################### - -AC_MSG_NOTICE([ - -Libindicator Configuration: - - Prefix: $prefix - GTK+ Version: $with_gtk - - Enable IDO loader: $enable_ido - Enable tests: $enable_tests - Enable debugging: $enable_debug - Coverage reporting: $use_gcov -]) -- cgit v1.2.3