|
From: <gp...@us...> - 2026-05-11 17:52:26
|
Revision: 46104
http://sourceforge.net/p/vice-emu/code/46104
Author: gpz
Date: 2026-05-11 17:52:24 +0000 (Mon, 11 May 2026)
Log Message:
-----------
fix autogen.sh to correctly extract the subdir from AX_SUBDIRS_CONFIGURE invocation with more than one parameter. Use only one invocation in configure.ac so it doesnt run configure in the subdir multiple times but actually once with all provided arguments :)
Modified Paths:
--------------
trunk/vice/autogen.sh
trunk/vice/configure.ac
Modified: trunk/vice/autogen.sh
===================================================================
--- trunk/vice/autogen.sh 2026-05-11 16:33:38 UTC (rev 46103)
+++ trunk/vice/autogen.sh 2026-05-11 17:52:24 UTC (rev 46104)
@@ -201,7 +201,7 @@
IFS=$old_IFS
SUBDIRECTORIES=$(sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.ac)
-SUBDIRECTORIES2=$(sed -ne "s/.*AX_SUBDIRS_CONFIGURE(\[\(.*\)],.*).*/\1/p" configure.ac)
+SUBDIRECTORIES2=$(sed -ne "s/.*AX_SUBDIRS_CONFIGURE(\[\([a-zA-Z0-9/_-]*\)],.*).*/\1/p" configure.ac)
for A in $SUBDIRECTORIES $SUBDIRECTORIES2; do
(
@@ -212,17 +212,19 @@
buildfiles
-if [ x"$1" = x"--dist" ]; then
-
- ./configure
- (cd src/monitor/; make mon_lex.c mon_parse.c)
-
- (cd po; make cat-id-tbl.c)
-
- SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c"
- SVN_ADD_MAKEFILES="`find . -name Makefile.in`"
-
- svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES
-
-fi
-
+# Whatever this tried to do, its probably obsolete
+#
+#if [ x"$1" = x"--dist" ]; then
+#
+# ./configure
+# (cd src/monitor/; make mon_lex.c mon_parse.c)
+#
+# (cd po; make cat-id-tbl.c)
+#
+# SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c"
+# SVN_ADD_MAKEFILES="`find . -name Makefile.in`"
+#
+# svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES
+#
+#fi
+#
Modified: trunk/vice/configure.ac
===================================================================
--- trunk/vice/configure.ac 2026-05-11 16:33:38 UTC (rev 46103)
+++ trunk/vice/configure.ac 2026-05-11 17:52:24 UTC (rev 46104)
@@ -2048,8 +2048,7 @@
if test x"$with_residfp" = "xyes" -o x"$with_residfp" = "x"; then
AC_DEFINE(HAVE_RESIDFP,,[This version provides ReSIDfp support.])
HAVE_RESIDFP_SUPPORT="yes"
- AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-option-checking])
- AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-tests])
+ AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [[--disable-option-checking],[--disable-tests]])
RESIDFP_DIR=lib/libresidfp
RESIDFP_LIBS="\$(top_builddir)/src/lib/libresidfp/libresidfp.a"
RESIDFP_INCLUDES="-I\$(top_srcdir)/src/lib/libresidfp -I\$(top_builddir)/src/lib/libresidfp/src"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
