From 07896d3d164b6d6a6699450ca43272b61526fb78 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 12 Jun 2014 11:28:22 +0200 Subject: [PATCH] Modernize configure.ac --- as10k1/{configure.in => configure.ac} | 6 +++--- echomixer/{configure.in => configure.ac} | 6 +++--- envy24control/{configure.in => configure.ac} | 6 +++--- hda-verb/configure.ac | 4 ++-- hdajackretask/{configure.in => configure.ac} | 0 hdspconf/{configure.in => configure.ac} | 4 ++-- hdsploader/{configure.in => configure.ac} | 4 ++-- hdspmixer/{configure.in => configure.ac} | 4 ++-- hwmixvolume/configure.ac | 2 +- ld10k1/INSTALL | 8 ++++---- ld10k1/{configure.in => configure.ac} | 4 ++-- ld10k1/include/Makefile.am | 2 +- sb16_csp/configure.in => mixartloader/configure.ac | 4 ++-- mixartloader/configure.in | 12 ------------ vxloader/configure.in => pcxhrloader/configure.ac | 4 ++-- qlo10k1/INSTALL | 8 ++++---- qlo10k1/config.h.in | 2 +- qlo10k1/{configure.in => configure.ac} | 4 ++-- rmedigicontrol/{configure.in => configure.ac} | 4 ++-- pcxhrloader/configure.in => sb16_csp/configure.ac | 4 ++-- seq/sbiload/{configure.in => configure.ac} | 4 ++-- sscape_ctl/{configure.in => configure.ac} | 4 ++-- us428control/{configure.in => configure.ac} | 4 ++-- usx2yloader/{configure.in => configure.ac} | 4 ++-- vxloader/configure.ac | 12 ++++++++++++ 25 files changed, 60 insertions(+), 60 deletions(-) rename as10k1/{configure.in => configure.ac} (71%) rename echomixer/{configure.in => configure.ac} (72%) rename envy24control/{configure.in => configure.ac} (70%) rename hdajackretask/{configure.in => configure.ac} (100%) rename hdspconf/{configure.in => configure.ac} (94%) rename hdsploader/{configure.in => configure.ac} (75%) rename hdspmixer/{configure.in => configure.ac} (94%) rename ld10k1/{configure.in => configure.ac} (96%) rename sb16_csp/configure.in => mixartloader/configure.ac (77%) delete mode 100644 mixartloader/configure.in rename vxloader/configure.in => pcxhrloader/configure.ac (76%) rename qlo10k1/{configure.in => configure.ac} (93%) rename rmedigicontrol/{configure.in => configure.ac} (69%) rename pcxhrloader/configure.in => sb16_csp/configure.ac (74%) rename seq/sbiload/{configure.in => configure.ac} (73%) rename sscape_ctl/{configure.in => configure.ac} (74%) rename us428control/{configure.in => configure.ac} (73%) rename usx2yloader/{configure.in => configure.ac} (77%) create mode 100644 vxloader/configure.ac diff --git a/as10k1/configure.in b/as10k1/configure.ac similarity index 71% rename from as10k1/configure.in rename to as10k1/configure.ac index 1855eea..0c35cba 100644 --- a/as10k1/configure.in +++ b/as10k1/configure.ac @@ -1,9 +1,9 @@ -AC_INIT(as10k1.c) -AM_INIT_AUTOMAKE(as10k1, A0.99) -AM_MAINTAINER_MODE([enable]) +AC_INIT(as10k1.c, A0.99) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC +AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" diff --git a/echomixer/configure.in b/echomixer/configure.ac similarity index 72% rename from echomixer/configure.in rename to echomixer/configure.ac index b4c50f1..769c829 100644 --- a/echomixer/configure.in +++ b/echomixer/configure.ac @@ -1,9 +1,9 @@ -AC_INIT(echomixer.c) -AM_INIT_AUTOMAKE(echomixer, 1.0.5) -AM_MAINTAINER_MODE([enable]) +AC_INIT(echomixer.c, 1.0.5) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC +AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) PKG_CHECK_MODULES(ECHOMIXER, gtk+-2.0 alsa >= 1.0.0) diff --git a/envy24control/configure.in b/envy24control/configure.ac similarity index 70% rename from envy24control/configure.in rename to envy24control/configure.ac index 6a7b23a..08dcdd8 100644 --- a/envy24control/configure.in +++ b/envy24control/configure.ac @@ -1,9 +1,9 @@ -AC_INIT(envy24control.c) -AM_INIT_AUTOMAKE(envy24control, 0.6.0) -AM_MAINTAINER_MODE([enable]) +AC_INIT(envy24control.c, 0.6.0) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC +AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) PKG_CHECK_MODULES(ENVY24CONTROL, gtk+-2.0 alsa >= 0.9.0) diff --git a/hda-verb/configure.ac b/hda-verb/configure.ac index 21349b8..663efbd 100644 --- a/hda-verb/configure.ac +++ b/hda-verb/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(hda-verb.c) -AM_INIT_AUTOMAKE(hda-verb, 0.4) +AC_INIT(hda-verb, 0.4) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/hdajackretask/configure.in b/hdajackretask/configure.ac similarity index 100% rename from hdajackretask/configure.in rename to hdajackretask/configure.ac diff --git a/hdspconf/configure.in b/hdspconf/configure.ac similarity index 94% rename from hdspconf/configure.in rename to hdspconf/configure.ac index 37a18de..f0b0c95 100644 --- a/hdspconf/configure.in +++ b/hdspconf/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(src/hdspconf.cxx) -AM_INIT_AUTOMAKE(hdspconf, 1.4) +AC_INIT(hdspconf, 1.4) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CXX diff --git a/hdsploader/configure.in b/hdsploader/configure.ac similarity index 75% rename from hdsploader/configure.in rename to hdsploader/configure.ac index b530e9c..0ada4e6 100644 --- a/hdsploader/configure.in +++ b/hdsploader/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(hdsploader.c) -AM_INIT_AUTOMAKE(hdsploader, 1.2) +AC_INIT(hdsploader, 1.2) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/hdspmixer/configure.in b/hdspmixer/configure.ac similarity index 94% rename from hdspmixer/configure.in rename to hdspmixer/configure.ac index 5e2295b..0b32dba 100644 --- a/hdspmixer/configure.in +++ b/hdspmixer/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(src/hdspmixer.cxx) -AM_INIT_AUTOMAKE(hdspmixer, 1.11) +AC_INIT(hdspmixer, 1.11) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CXX diff --git a/hwmixvolume/configure.ac b/hwmixvolume/configure.ac index 5572412..09d5f09 100644 --- a/hwmixvolume/configure.ac +++ b/hwmixvolume/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([hwmixvolume], [0.9]) +AC_INIT(hwmixvolume, 0.9) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_CONFIG_SRCDIR([hwmixvolume]) diff --git a/ld10k1/INSTALL b/ld10k1/INSTALL index a1e89e1..007e939 100644 --- a/ld10k1/INSTALL +++ b/ld10k1/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/ld10k1/configure.in b/ld10k1/configure.ac similarity index 96% rename from ld10k1/configure.in rename to ld10k1/configure.ac index 6249e03..276b24e 100644 --- a/ld10k1/configure.in +++ b/ld10k1/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(src/ld10k1.c) -AM_INIT_AUTOMAKE(ld10k1, 0.1.8p1) +AC_INIT(ld10k1, 0.1.8p1) +AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE([enable]) diff --git a/ld10k1/include/Makefile.am b/ld10k1/include/Makefile.am index f9e8bc9..eba10f0 100644 --- a/ld10k1/include/Makefile.am +++ b/ld10k1/include/Makefile.am @@ -9,7 +9,7 @@ CLEANFILES = stamp-vh version.h lo10k1 version.h: stamp-vh @: -stamp-vh: $(top_builddir)/configure.in +stamp-vh: $(top_builddir)/configure.ac @echo "/*" > ver.tmp @echo " * version.h" >> ver.tmp @echo " */" >> ver.tmp diff --git a/sb16_csp/configure.in b/mixartloader/configure.ac similarity index 77% rename from sb16_csp/configure.in rename to mixartloader/configure.ac index 5e04236..448b581 100644 --- a/sb16_csp/configure.in +++ b/mixartloader/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(cspctl.c) -AM_INIT_AUTOMAKE(cspctl, 0.2.0) +AC_INIT(mixartloader, 1.0) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/mixartloader/configure.in b/mixartloader/configure.in deleted file mode 100644 index 6ad5ca7..0000000 --- a/mixartloader/configure.in +++ /dev/null @@ -1,12 +0,0 @@ -AC_INIT(mixartloader.c) -AM_INIT_AUTOMAKE(mixartloader, 1.0) -AM_MAINTAINER_MODE([enable]) -AC_PROG_CC -AC_PROG_INSTALL -AC_HEADER_STDC -AM_PATH_ALSA(1.0.0) - -CFLAGS="$CFLAGS $ALSA_CFLAGS" -LDFLAGS="$LDFLAGS $ALSA_LIBS" - -AC_OUTPUT(Makefile) diff --git a/vxloader/configure.in b/pcxhrloader/configure.ac similarity index 76% rename from vxloader/configure.in rename to pcxhrloader/configure.ac index 2035af3..c41c87d 100644 --- a/vxloader/configure.in +++ b/pcxhrloader/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(vxloader.c) -AM_INIT_AUTOMAKE(vxloader, 1.0) +AC_INIT(pcxhrloader, 1.0) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/qlo10k1/INSTALL b/qlo10k1/INSTALL index a1e89e1..007e939 100644 --- a/qlo10k1/INSTALL +++ b/qlo10k1/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/qlo10k1/config.h.in b/qlo10k1/config.h.in index f0b12a9..497de12 100644 --- a/qlo10k1/config.h.in +++ b/qlo10k1/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD diff --git a/qlo10k1/configure.in b/qlo10k1/configure.ac similarity index 93% rename from qlo10k1/configure.in rename to qlo10k1/configure.ac index 574754e..6e698d4 100644 --- a/qlo10k1/configure.in +++ b/qlo10k1/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(src/main.cpp) -AM_INIT_AUTOMAKE(qlo10k1, 0.1.2p1) +AC_INIT(qlo10k1, 0.1.2p1) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.h) diff --git a/rmedigicontrol/configure.in b/rmedigicontrol/configure.ac similarity index 69% rename from rmedigicontrol/configure.in rename to rmedigicontrol/configure.ac index bf8c3f4..9c38754 100644 --- a/rmedigicontrol/configure.in +++ b/rmedigicontrol/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(rmedigicontrol.c) -AM_INIT_AUTOMAKE(rmedigicontrol, 0.3.5a) +AC_INIT(rmedigicontrol, 0.3.5a) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/pcxhrloader/configure.in b/sb16_csp/configure.ac similarity index 74% rename from pcxhrloader/configure.in rename to sb16_csp/configure.ac index b8ee5d1..76d035e 100644 --- a/pcxhrloader/configure.in +++ b/sb16_csp/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(pcxhrloader.c) -AM_INIT_AUTOMAKE(pcxhrloader, 1.0) +AC_INIT(cspctl, 0.2.0) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/seq/sbiload/configure.in b/seq/sbiload/configure.ac similarity index 73% rename from seq/sbiload/configure.in rename to seq/sbiload/configure.ac index fd01843..87b3449 100644 --- a/seq/sbiload/configure.in +++ b/seq/sbiload/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(sbiload.c) -AM_INIT_AUTOMAKE(sbiload, 0.4.0) +AC_INIT(sbiload, 0.4.0) +AM_INIT_AUTOMAKE AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/sscape_ctl/configure.in b/sscape_ctl/configure.ac similarity index 74% rename from sscape_ctl/configure.in rename to sscape_ctl/configure.ac index 98eed8b..c1c048f 100644 --- a/sscape_ctl/configure.in +++ b/sscape_ctl/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(sscape_ctl.c) -AM_INIT_AUTOMAKE(sscape_ctl, 0.1.0) +AC_INIT(sscape_ctl, 0.1.0) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/us428control/configure.in b/us428control/configure.ac similarity index 73% rename from us428control/configure.in rename to us428control/configure.ac index 031ef3e..f3f5814 100644 --- a/us428control/configure.in +++ b/us428control/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(us428control.cc) -AM_INIT_AUTOMAKE(us428control, 0.4.6) +AC_INIT(us428control, 0.4.6) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CXX AC_PROG_INSTALL diff --git a/usx2yloader/configure.in b/usx2yloader/configure.ac similarity index 77% rename from usx2yloader/configure.in rename to usx2yloader/configure.ac index 800e6e0..c789a4b 100644 --- a/usx2yloader/configure.in +++ b/usx2yloader/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(usx2yloader.c) -AM_INIT_AUTOMAKE(usx2yloader, 0.3) +AC_INIT(usx2yloader, 0.3) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL diff --git a/vxloader/configure.ac b/vxloader/configure.ac new file mode 100644 index 0000000..21e9c95 --- /dev/null +++ b/vxloader/configure.ac @@ -0,0 +1,12 @@ +AC_INIT(vxloader, 1.0) +AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) +AC_PROG_CC +AC_PROG_INSTALL +AC_HEADER_STDC +AM_PATH_ALSA(1.0.0) + +CFLAGS="$CFLAGS $ALSA_CFLAGS" +LDFLAGS="$LDFLAGS $ALSA_LIBS" + +AC_OUTPUT(Makefile) -- 2.47.1