[pacman-dev] remove more autotools files

Message ID 20200811005229.1447327-1-eschwartz@archlinux.org
State New
Headers show
Series
  • [pacman-dev] remove more autotools files
Related show

Commit Message

Eli Schwartz Aug. 11, 2020, 12:52 a.m. UTC
We forgot to remove m4/ in commit 454ea024383eab60295e4c4fdf2c329475887b2c
and now it's tragically reminding me of autotools!

Also take this opportunity to drop some symlinks in lib/libalpm/ for
libcommon source files. In autotools these were built specifically for
libalpm and needed to be available in that directory, but the meson
setup just has libalpm depend on libcommon. So these pseudo source files
aren't needed anymore.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 lib/libalpm/ini.c         |   1 -
 lib/libalpm/ini.h         |   1 -
 lib/libalpm/util-common.c |   1 -
 lib/libalpm/util-common.h |   1 -
 m4/.gitignore             |   3 -
 m4/acinclude.m4           | 179 ----------------------------
 m4/gpgme.m4               | 238 --------------------------------------
 7 files changed, 424 deletions(-)
 delete mode 120000 lib/libalpm/ini.c
 delete mode 120000 lib/libalpm/ini.h
 delete mode 120000 lib/libalpm/util-common.c
 delete mode 120000 lib/libalpm/util-common.h
 delete mode 100644 m4/.gitignore
 delete mode 100644 m4/acinclude.m4
 delete mode 100644 m4/gpgme.m4

Comments

Allan McRae Aug. 11, 2020, 1:30 p.m. UTC | #1
On 11/8/20 10:52 am, Eli Schwartz wrote:
> We forgot to remove m4/ in commit 454ea024383eab60295e4c4fdf2c329475887b2c
> and now it's tragically reminding me of autotools!
> 
> Also take this opportunity to drop some symlinks in lib/libalpm/ for
> libcommon source files. In autotools these were built specifically for
> libalpm and needed to be available in that directory, but the meson
> setup just has libalpm depend on libcommon. So these pseudo source files
> aren't needed anymore.
> 
> Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>

Looks good.

A

Patch

diff --git a/lib/libalpm/ini.c b/lib/libalpm/ini.c
deleted file mode 120000
index b16d2f27..00000000
--- a/lib/libalpm/ini.c
+++ /dev/null
@@ -1 +0,0 @@ 
-../../src/common/ini.c
\ No newline at end of file
diff --git a/lib/libalpm/ini.h b/lib/libalpm/ini.h
deleted file mode 120000
index e395fa04..00000000
--- a/lib/libalpm/ini.h
+++ /dev/null
@@ -1 +0,0 @@ 
-../../src/common/ini.h
\ No newline at end of file
diff --git a/lib/libalpm/util-common.c b/lib/libalpm/util-common.c
deleted file mode 120000
index cf965176..00000000
--- a/lib/libalpm/util-common.c
+++ /dev/null
@@ -1 +0,0 @@ 
-../../src/common/util-common.c
\ No newline at end of file
diff --git a/lib/libalpm/util-common.h b/lib/libalpm/util-common.h
deleted file mode 120000
index 988c2acc..00000000
--- a/lib/libalpm/util-common.h
+++ /dev/null
@@ -1 +0,0 @@ 
-../../src/common/util-common.h
\ No newline at end of file
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index 4bc6b527..00000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@ 
-*.m4
-!acinclude.m4
-!gpgme.m4
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
deleted file mode 100644
index 845c8286..00000000
--- a/m4/acinclude.m4
+++ /dev/null
@@ -1,179 +0,0 @@ 
-dnl acinclude.m4 - configure macros used by pacman and libalpm
-dnl Add some custom macros for pacman and libalpm
-
-dnl GCC_STACK_PROTECT_LIB
-dnl adds -lssp to LIBS if it is available
-dnl ssp is usually provided as part of libc, but was previously a separate lib
-dnl It does not hurt to add -lssp even if libc provides SSP - in that case
-dnl libssp will simply be ignored.
-AC_DEFUN([GCC_STACK_PROTECT_LIB],[
-  AC_CACHE_CHECK([whether libssp exists], ssp_cv_lib,
-    [ssp_old_libs="$LIBS"
-     LIBS="$LIBS -lssp"
-     AC_TRY_LINK(,, ssp_cv_lib=yes, ssp_cv_lib=no)
-     LIBS="$ssp_old_libs"
-    ])
-  if test $ssp_cv_lib = yes; then
-    LIBS="$LIBS -lssp"
-  fi
-])
-
-dnl GCC_STACK_PROTECT_CC
-dnl checks -fstack-protector-all with the C compiler, if it exists then updates
-dnl CFLAGS and defines ENABLE_SSP_CC
-AC_DEFUN([GCC_STACK_PROTECT_CC],[
-  AC_LANG_ASSERT(C)
-  if test "X$CC" != "X"; then
-    AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector-all],
-      ssp_cv_cc,
-      [ssp_old_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -fstack-protector-all"
-       AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
-       CFLAGS="$ssp_old_cflags"
-      ])
-    if test $ssp_cv_cc = yes; then
-      CFLAGS="$CFLAGS -fstack-protector-all"
-      AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
-    fi
-  fi
-])
-
-dnl GCC_STACK_CLASH_PROTECTION
-dnl check -fstack-clash-protection with the C compiler, if it exists then
-dnl updates CFLAGS
-AC_DEFUN([GCC_STACK_CLASH_PROTECTION],[
-  AC_LANG_ASSERT(C)
-  if test "X$CC" != "X"; then
-    AC_CACHE_CHECK([whether ${CC} accepts -fstack-clash-protection],
-      scp_cv_cc,
-      [scp_old_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -fstack-clash-protection"
-       AC_TRY_COMPILE(,, scp_cv_cc=yes, scp_cv_cc=no)
-       CFLAGS="$scp_old_cflags"
-      ])
-    if test $scp_cv_cc = yes; then
-      CFLAGS="$CFLAGS -fstack-clash-protection"
-    fi
-  fi
-])
-
-dnl GCC_FORTIFY_SOURCE_CC
-dnl checks -D_FORTIFY_SOURCE with the C compiler, if it exists then updates
-dnl CPPFLAGS
-AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[
-  AC_LANG_ASSERT(C)
-  if test "X$CC" != "X"; then
-    AC_MSG_CHECKING(for FORTIFY_SOURCE support)
-    fs_old_cppflags="$CPPFLAGS"
-    fs_old_cflags="$CFLAGS"
-    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
-    CFLAGS="$CFLAGS -Werror"
-    AC_TRY_COMPILE([#include <features.h>], [
-      int main() {
-      #if !(__GNUC_PREREQ (4, 1) )
-      #error No FORTIFY_SOURCE support
-      #endif
-        return 0;
-      }
-    ], [
-      AC_MSG_RESULT(yes)
-      CFLAGS="$fs_old_cflags"
-    ], [
-      AC_MSG_RESULT(no)
-      CPPFLAGS="$fs_old_cppflags"
-      CFLAGS="$fs_old_cflags"
-    ])
-  fi
-])
-
-dnl GCC_VISIBILITY_CC
-dnl checks -fvisibility=internal with the C compiler, if it exists then
-dnl defines ENABLE_VISIBILITY_CC in both configure script and Makefiles
-AC_DEFUN([GCC_VISIBILITY_CC],[
-  AC_LANG_ASSERT(C)
-  if test "X$CC" != "X"; then
-    AC_CACHE_CHECK([whether ${CC} accepts -fvisibility=internal],
-      visibility_cv_cc,
-      [visibility_old_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -fvisibility=internal"
-       AC_TRY_COMPILE(,, visibility_cv_cc=yes, visibility_cv_cc=no)
-       CFLAGS="$visibility_old_cflags"
-      ])
-    if test $visibility_cv_cc = yes; then
-      AC_DEFINE([ENABLE_VISIBILITY_CC], 1, [Define if symbol visibility C support is enabled.])
-    fi
-    AM_CONDITIONAL([ENABLE_VISIBILITY_CC], test "x$visibility_cv_cc" = "xyes")
-  fi
-])
-
-dnl CFLAGS_ADD(PARAMETER, VARIABLE)
-dnl Adds parameter to VARIABLE if the compiler supports it.  For example,
-dnl CFLAGS_ADD([-Wall],[WARN_FLAGS]).
-AC_DEFUN([CFLAGS_ADD],
-[AS_VAR_PUSHDEF([my_cflags], [cflags_cv_warn_$1])dnl
-AC_CACHE_CHECK([whether compiler handles $1], [my_cflags], [
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="${CFLAGS} -Werror=unknown-warning-option"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-                    [],
-                    [CFLAGS="$save_CFLAGS"])
-  CFLAGS="${CFLAGS} $1"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-                    [AS_VAR_SET([my_cflags], [yes])],
-                    [AS_VAR_SET([my_cflags], [no])])
-  CFLAGS="$save_CFLAGS"
-])
-AS_VAR_PUSHDEF([new_cflags], [[$2]])dnl
-AS_VAR_IF([my_cflags], [yes], [AS_VAR_APPEND([new_cflags], [" $1"])])
-AS_VAR_POPDEF([new_cflags])dnl
-AS_VAR_POPDEF([my_cflags])dnl
-m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
-])
-
-dnl Checks for getmntinfo and determines whether it uses statfs or statvfs
-AC_DEFUN([FS_STATS_TYPE],
-  [AC_CACHE_CHECK([filesystem statistics type], fs_stats_cv_type,
-    [AC_CHECK_FUNC(getmntinfo,
-      [AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[
-# include <sys/param.h>
-# include <sys/mount.h>
-#if HAVE_SYS_UCRED_H
-#include <sys/ucred.h>
-#endif
-extern int getmntinfo (struct statfs **, int);
-]],
-          [])],
-        [fs_stats_cv_type="struct statfs"],
-        [fs_stats_cv_type="struct statvfs"])],
-      [AC_CHECK_FUNC(getmntent,
-        [fs_stats_cv_type="struct statvfs"])]
-    )]
-  )
-  AC_DEFINE_UNQUOTED(FSSTATSTYPE, [$fs_stats_cv_type],
-    [Defined as the filesystem stats type ('statvfs' or 'statfs')])
-  if test $ac_cv_func_getmntinfo = yes; then
-    if test "$fs_stats_cv_type" = "struct statvfs"; then
-      AC_DEFINE([HAVE_GETMNTINFO_STATVFS], 1, [Define if getmntinfo() uses statvfs.])
-    else
-      AC_DEFINE([HAVE_GETMNTINFO_STATFS], 1, [Define if getmntinfo() uses statfs.])
-    fi
-  fi
-])
-
-dnl Checks for PATH_MAX and defines it if not present
-AC_DEFUN([PATH_MAX_DEFINED],
-  [AC_CACHE_CHECK([PATH_MAX defined], path_max_cv_defined,
-    [AC_EGREP_CPP(yes, [[
-#include <limits.h>
-#if defined(PATH_MAX)
-yes
-#endif
-]],
-      [path_max_cv_defined=yes],
-      [path_max_cv_defined=no])]
-  )
-  if test $path_max_cv_defined = no; then
-    AC_DEFINE([PATH_MAX], 4096, [Define if PATH_MAX is undefined by limits.h.])
-  fi
-])
diff --git a/m4/gpgme.m4 b/m4/gpgme.m4
deleted file mode 100644
index fe17f21a..00000000
--- a/m4/gpgme.m4
+++ /dev/null
@@ -1,238 +0,0 @@ 
-# gpgme.m4 - autoconf macro to detect GPGME.
-# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This file 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.
-
-
-AC_DEFUN([_AM_PATH_GPGME_CONFIG],
-[ AC_ARG_WITH(gpgme-prefix,
-            AC_HELP_STRING([--with-gpgme-prefix=PFX],
-                           [prefix where GPGME is installed (optional)]),
-     gpgme_config_prefix="$withval", gpgme_config_prefix="")
-  if test "x$gpgme_config_prefix" != x ; then
-      GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
-  fi
-  AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
-
-  if test "$GPGME_CONFIG" != "no" ; then
-    gpgme_version=`$GPGME_CONFIG --version`
-  fi
-  gpgme_version_major=`echo $gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-  gpgme_version_minor=`echo $gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-  gpgme_version_micro=`echo $gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-])
-
-dnl AM_PATH_GPGME([MINIMUM-VERSION,
-dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
-dnl
-AC_DEFUN([AM_PATH_GPGME],
-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
-  tmp=ifelse([$1], ,1:0.4.2,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-     req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-     min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
-     req_gpgme_api=0
-     min_gpgme_version="$tmp"
-  fi
-
-  AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
-  ok=no
-  if test "$GPGME_CONFIG" != "no" ; then
-    req_major=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-    req_minor=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    req_micro=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    if test "$gpgme_version_major" -gt "$req_major"; then
-        ok=yes
-    else 
-        if test "$gpgme_version_major" -eq "$req_major"; then
-            if test "$gpgme_version_minor" -gt "$req_minor"; then
-               ok=yes
-            else
-               if test "$gpgme_version_minor" -eq "$req_minor"; then
-                   if test "$gpgme_version_micro" -ge "$req_micro"; then
-                     ok=yes
-                   fi
-               fi
-            fi
-        fi
-    fi
-  fi
-  if test $ok = yes; then
-     # If we have a recent GPGME, we should also check that the
-     # API is compatible.
-     if test "$req_gpgme_api" -gt 0 ; then
-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           if test "$req_gpgme_api" -ne "$tmp" ; then
-             ok=no
-           fi
-        fi
-     fi
-  fi
-  if test $ok = yes; then
-    GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
-    GPGME_LIBS=`$GPGME_CONFIG --libs`
-    AC_MSG_RESULT(yes)
-    ifelse([$2], , :, [$2])
-  else
-    GPGME_CFLAGS=""
-    GPGME_LIBS=""
-    AC_MSG_RESULT(no)
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GPGME_CFLAGS)
-  AC_SUBST(GPGME_LIBS)
-])
-
-dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
-dnl                       [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
-dnl  and GPGME_PTHREAD_LIBS.
-dnl
-AC_DEFUN([AM_PATH_GPGME_PTHREAD],
-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
-  tmp=ifelse([$1], ,1:0.4.2,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-     req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-     min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
-     req_gpgme_api=0
-     min_gpgme_version="$tmp"
-  fi
-
-  AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
-  ok=no
-  if test "$GPGME_CONFIG" != "no" ; then
-    if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then
-      req_major=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-      req_minor=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-      req_micro=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-      if test "$gpgme_version_major" -gt "$req_major"; then
-        ok=yes
-      else 
-        if test "$gpgme_version_major" -eq "$req_major"; then
-          if test "$gpgme_version_minor" -gt "$req_minor"; then
-            ok=yes
-          else
-            if test "$gpgme_version_minor" -eq "$req_minor"; then
-              if test "$gpgme_version_micro" -ge "$req_micro"; then
-                ok=yes
-              fi
-            fi
-          fi
-        fi
-      fi
-    fi
-  fi
-  if test $ok = yes; then
-     # If we have a recent GPGME, we should also check that the
-     # API is compatible.
-     if test "$req_gpgme_api" -gt 0 ; then
-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           if test "$req_gpgme_api" -ne "$tmp" ; then
-             ok=no
-           fi
-        fi
-     fi
-  fi
-  if test $ok = yes; then
-    GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags`
-    GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
-    AC_MSG_RESULT(yes)
-    ifelse([$2], , :, [$2])
-  else
-    GPGME_PTHREAD_CFLAGS=""
-    GPGME_PTHREAD_LIBS=""
-    AC_MSG_RESULT(no)
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GPGME_PTHREAD_CFLAGS)
-  AC_SUBST(GPGME_PTHREAD_LIBS)
-])
-
-
-dnl AM_PATH_GPGME_GLIB([MINIMUM-VERSION,
-dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgpgme-glib and define GPGME_GLIB_CFLAGS and GPGME_GLIB_LIBS.
-dnl
-AC_DEFUN([AM_PATH_GPGME_GLIB],
-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
-  tmp=ifelse([$1], ,1:0.4.2,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-     req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-     min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
-     req_gpgme_api=0
-     min_gpgme_version="$tmp"
-  fi
-
-  AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
-  ok=no
-  if test "$GPGME_CONFIG" != "no" ; then
-    req_major=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-    req_minor=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    req_micro=`echo $min_gpgme_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    if test "$gpgme_version_major" -gt "$req_major"; then
-        ok=yes
-    else 
-        if test "$gpgme_version_major" -eq "$req_major"; then
-            if test "$gpgme_version_minor" -gt "$req_minor"; then
-               ok=yes
-            else
-               if test "$gpgme_version_minor" -eq "$req_minor"; then
-                   if test "$gpgme_version_micro" -ge "$req_micro"; then
-                     ok=yes
-                   fi
-               fi
-            fi
-        fi
-    fi
-  fi
-  if test $ok = yes; then
-     # If we have a recent GPGME, we should also check that the
-     # API is compatible.
-     if test "$req_gpgme_api" -gt 0 ; then
-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           if test "$req_gpgme_api" -ne "$tmp" ; then
-             ok=no
-           fi
-        fi
-     fi
-  fi
-  if test $ok = yes; then
-    GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
-    GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
-    AC_MSG_RESULT(yes)
-    ifelse([$2], , :, [$2])
-  else
-    GPGME_GLIB_CFLAGS=""
-    GPGME_GLIB_LIBS=""
-    AC_MSG_RESULT(no)
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GPGME_GLIB_CFLAGS)
-  AC_SUBST(GPGME_GLIB_LIBS)
-])
-