mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the AX_CFLAGS_GCC_OPTION macro to the latest GPL2 version. Increase

Browse Source 
minimum required autoconf version to 2.61. While there correct AM_INIT_AUTOMAKE.
This commit is contained in:
mmdolze
2011-11-07 06:55:00 +00:00
parent 641d1f0931
commit 5b82c82b25
2 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acinclude.m4
+50 -41
View File
@@ -914,35 +914,38 @@ AC_SUBST(enable_latex_dox)
dnl Check if a given flag is understood and add it to CFLAGS. dnl Check if a given flag is understood and add it to CFLAGS.
dnl From: http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html dnl From http://www.gnu.org/software/autoconf-archive/ax_cflags_gcc_option.html
dnl Author: Guido Draheim <guidod@gmx.de> dnl Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
dnl Last Modified: 2003-11-04 dnl serial 12
dnl Note: This is the last version released under GPLv2.
AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$2])dnl
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
VAR,[VAR="no, unknown" VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_C AC_LANG_C
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic % m4_ifval($2,$2,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
"-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_TRY_COMPILE([],[return 0;],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
case ".$VAR" in m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;; .|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[ *) m4_ifvaln($3,$3,[
if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null
then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var])
else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"])
m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"
fi ]) ;; fi ]) ;;
esac esac
AS_VAR_POPDEF([VAR])dnl AS_VAR_POPDEF([VAR])dnl
@@ -954,30 +957,32 @@ dnl the only difference - the LANG selection... and the default FLAGS
AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$2])dnl
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
VAR,[VAR="no, unknown" VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CXX AC_LANG_CPLUSPLUS
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic % m4_ifval($2,$2,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
"-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_TRY_COMPILE([],[return 0;],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
case ".$VAR" in m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;; .|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[ *) m4_ifvaln($3,$3,[
if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null
then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var])
else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"])
m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"
fi ]) ;; fi ]) ;;
esac esac
AS_VAR_POPDEF([VAR])dnl AS_VAR_POPDEF([VAR])dnl
@@ -988,30 +993,32 @@ dnl -------------------------------------------------------------------------
AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$1])dnl
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
VAR,[VAR="no, unknown" VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_C AC_LANG_C
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic % m4_ifval($1,$1,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
"-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_TRY_COMPILE([],[return 0;],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
case ".$VAR" in m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;; .|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[ *) m4_ifvaln($3,$3,[
if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null
then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR]) then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var])
else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"]) else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"])
m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR" m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"
fi ]) ;; fi ]) ;;
esac esac
AS_VAR_POPDEF([VAR])dnl AS_VAR_POPDEF([VAR])dnl
@@ -1023,30 +1030,32 @@ dnl the only difference - the LANG selection... and the default FLAGS
AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$1])dnl
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
VAR,[VAR="no, unknown" VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CXX AC_LANG_CPLUSPLUS
ac_save_[]FLAGS="$[]FLAGS" ac_save_[]FLAGS="$[]FLAGS"
for ac_arg dnl for ac_arg dnl
in "-pedantic % m4_ifval($1,$1,-option)" dnl GCC in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
"-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
# #
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;], AC_TRY_COMPILE([],[return 0;],
[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done done
FLAGS="$ac_save_[]FLAGS" FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
case ".$VAR" in m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;; .ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;; .|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[ *) m4_ifvaln($3,$3,[
if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null
then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR]) then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var])
else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"]) else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"])
m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR" m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"
fi ]) ;; fi ]) ;;
esac esac
AS_VAR_POPDEF([VAR])dnl AS_VAR_POPDEF([VAR])dnl
configure.in
+4 -4
View File
@@ -1,9 +1,9 @@
# -*- mode: m4; -*- # -*- mode: m4; -*-
dnl Process this file with autoconf 2.50 (or higher) to produce a configure script. dnl Process this file with autoconf 2.61 (or higher) to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ(2.61)
AC_INIT(lcdproc, 0.5dev, lcdproc@lists.omnipotent.net) AC_INIT([lcdproc], [0.5dev], [lcdproc@lists.omnipotent.net])
AC_CONFIG_SRCDIR([clients/lcdproc/batt.c]) AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
AM_INIT_AUTOMAKE(1.7) AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)