Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autotools #37

Merged
merged 3 commits into from
Sep 2, 2020
Merged

Autotools #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
889c338
configure: replace deprecated macros
cgzones Jun 29, 2020
a44cd83
autogen: use force option and enable warnings
cgzones Jun 29, 2020
7616f6e
ci: use in-tree autoconf wrapper
cgzones Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

autoreconf -vi
autoreconf -vif -Wall
2 changes: 1 addition & 1 deletion ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN dnf -y install \

COPY . .

RUN autoreconf -vi
RUN ./autogen.sh
RUN ./configure
RUN make

Expand Down
20 changes: 10 additions & 10 deletions configure.ac
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ(2.57)
AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org)
AC_PREREQ([2.57])
AC_INIT([popt], [1.18], [rpm-maint@lists.rpm.org])
AC_CONFIG_SRCDIR([src/popt.h])
AC_CONFIG_HEADERS([config.h])

Expand All @@ -14,11 +14,11 @@ AC_USE_SYSTEM_EXTENSIONS
AM_PROG_AR

AC_PROG_INSTALL
AC_PROG_LIBTOOL
LT_INIT

AC_SYS_LARGEFILE

AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h)
AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h])

# For some systems we know that we have ld_version scripts.
# Use it then as default.
Expand All @@ -32,15 +32,15 @@ case "${host}" in
;;
esac
AC_ARG_ENABLE([ld-version-script],
AC_HELP_STRING([--enable-ld-version-script],
[AS_HELP_STRING([--enable-ld-version-script],
[enable/disable use of linker version script.
(default is system dependent)]),
(default is system dependent)])],
[have_ld_version_script=$enableval],
[ : ] )
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")

AC_ARG_ENABLE(build-gcov,
AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl
AC_ARG_ENABLE([build-gcov],
[AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov])], [dnl
if test ".$enableval" = .yes; then
if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
dnl # GNU GCC (usually "gcc")
Expand All @@ -49,8 +49,8 @@ AC_ARG_ENABLE(build-gcov,
fi
])

AC_SEARCH_LIBS(setreuid, [ucb])
AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p)
AC_SEARCH_LIBS([setreuid], [ucb])
AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p])

AM_GNU_GETTEXT_VERSION([0.18.2])
AM_GNU_GETTEXT([external])
Expand Down