This long line breaks automated rebasing of one of testing branches on (namely ntoskrnl) on my box every time a new dll or program is added. That's because I need to merge conflict for this line by my hand.
And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical.
--- configure | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 325 insertions(+), 1 deletions(-)
diff --git a/configure b/configure index fb9c11f..67f1942 100755 --- a/configure +++ b/configure @@ -20427,7 +20427,331 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules
-ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/browseui/Makefile dlls/browseui/tests/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/credui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/ddrawex/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/itss/tests/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/odbccp32/tests/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/serialui/tests/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/sfc_os/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/snmpapi/tests/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winealsa.drv/Makefile dlls/winearts.drv/Makefile dlls/wineaudioio.drv/Makefile dlls/winecoreaudio.drv/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineesd.drv/Makefile dlls/winejack.drv/Makefile dlls/winejoystick.drv/Makefile dlls/winemp3.acm/Makefile dlls/winenas.drv/Makefile dlls/wineoss.drv/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wing32/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/tests/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files \ + Make.rules \ + dlls/Makedll.rules \ + dlls/Makeimplib.rules \ + dlls/Maketest.rules \ + programs/Makeprog.rules \ + Makefile \ + dlls/Makefile \ + dlls/activeds/Makefile \ + dlls/advapi32/Makefile \ + dlls/advapi32/tests/Makefile \ + dlls/advpack/Makefile \ + dlls/advpack/tests/Makefile \ + dlls/amstream/Makefile \ + dlls/atl/Makefile \ + dlls/avicap32/Makefile \ + dlls/avifil32/Makefile \ + dlls/browseui/Makefile \ + dlls/browseui/tests/Makefile \ + dlls/cabinet/Makefile \ + dlls/cabinet/tests/Makefile \ + dlls/capi2032/Makefile \ + dlls/cards/Makefile \ + dlls/cfgmgr32/Makefile \ + dlls/clusapi/Makefile \ + dlls/comcat/Makefile \ + dlls/comcat/tests/Makefile \ + dlls/comctl32/Makefile \ + dlls/comctl32/tests/Makefile \ + dlls/comdlg32/Makefile \ + dlls/comdlg32/tests/Makefile \ + dlls/compstui/Makefile \ + dlls/credui/Makefile \ + dlls/crtdll/Makefile \ + dlls/crypt32/Makefile \ + dlls/crypt32/tests/Makefile \ + dlls/cryptdll/Makefile \ + dlls/cryptnet/Makefile \ + dlls/ctl3d32/Makefile \ + dlls/d3d8/Makefile \ + dlls/d3d8/tests/Makefile \ + dlls/d3d9/Makefile \ + dlls/d3d9/tests/Makefile \ + dlls/d3dim/Makefile \ + dlls/d3drm/Makefile \ + dlls/d3dx8/Makefile \ + dlls/d3dxof/Makefile \ + dlls/dbghelp/Makefile \ + dlls/dciman32/Makefile \ + dlls/ddraw/Makefile \ + dlls/ddraw/tests/Makefile \ + dlls/ddrawex/Makefile \ + dlls/devenum/Makefile \ + dlls/dinput/Makefile \ + dlls/dinput/tests/Makefile \ + dlls/dinput8/Makefile \ + dlls/dmband/Makefile \ + dlls/dmcompos/Makefile \ + dlls/dmime/Makefile \ + dlls/dmloader/Makefile \ + dlls/dmscript/Makefile \ + dlls/dmstyle/Makefile \ + dlls/dmsynth/Makefile \ + dlls/dmusic/Makefile \ + dlls/dmusic32/Makefile \ + dlls/dnsapi/Makefile \ + dlls/dnsapi/tests/Makefile \ + dlls/dplay/Makefile \ + dlls/dplayx/Makefile \ + dlls/dpnet/Makefile \ + dlls/dpnhpast/Makefile \ + dlls/dsound/Makefile \ + dlls/dsound/tests/Makefile \ + dlls/dswave/Makefile \ + dlls/dxdiagn/Makefile \ + dlls/dxerr8/Makefile \ + dlls/dxerr9/Makefile \ + dlls/dxguid/Makefile \ + dlls/gdi32/Makefile \ + dlls/gdi32/tests/Makefile \ + dlls/glu32/Makefile \ + dlls/gphoto2.ds/Makefile \ + dlls/hhctrl.ocx/Makefile \ + dlls/hid/Makefile \ + dlls/hlink/Makefile \ + dlls/hlink/tests/Makefile \ + dlls/iccvid/Makefile \ + dlls/icmp/Makefile \ + dlls/ifsmgr.vxd/Makefile \ + dlls/imaadp32.acm/Makefile \ + dlls/imagehlp/Makefile \ + dlls/imm32/Makefile \ + dlls/infosoft/Makefile \ + dlls/infosoft/tests/Makefile \ + dlls/inseng/Makefile \ + dlls/iphlpapi/Makefile \ + dlls/iphlpapi/tests/Makefile \ + dlls/itss/Makefile \ + dlls/itss/tests/Makefile \ + dlls/kernel32/Makefile \ + dlls/kernel32/tests/Makefile \ + dlls/localspl/Makefile \ + dlls/localspl/tests/Makefile \ + dlls/lz32/Makefile \ + dlls/lz32/tests/Makefile \ + dlls/mapi32/Makefile \ + dlls/mapi32/tests/Makefile \ + dlls/mciavi32/Makefile \ + dlls/mcicda/Makefile \ + dlls/mciseq/Makefile \ + dlls/mciwave/Makefile \ + dlls/midimap/Makefile \ + dlls/mlang/Makefile \ + dlls/mlang/tests/Makefile \ + dlls/mmdevldr.vxd/Makefile \ + dlls/monodebg.vxd/Makefile \ + dlls/mpr/Makefile \ + dlls/mprapi/Makefile \ + dlls/msacm32.drv/Makefile \ + dlls/msacm32/Makefile \ + dlls/msacm32/tests/Makefile \ + dlls/msadp32.acm/Makefile \ + dlls/mscms/Makefile \ + dlls/mscms/tests/Makefile \ + dlls/mscoree/Makefile \ + dlls/msdmo/Makefile \ + dlls/msftedit/Makefile \ + dlls/msg711.acm/Makefile \ + dlls/mshtml/Makefile \ + dlls/mshtml/tests/Makefile \ + dlls/msi/Makefile \ + dlls/msi/tests/Makefile \ + dlls/msimg32/Makefile \ + dlls/msisys.ocx/Makefile \ + dlls/msnet32/Makefile \ + dlls/msrle32/Makefile \ + dlls/msvcrt/Makefile \ + dlls/msvcrt/tests/Makefile \ + dlls/msvcrt20/Makefile \ + dlls/msvcrt40/Makefile \ + dlls/msvcrtd/Makefile \ + dlls/msvcrtd/tests/Makefile \ + dlls/msvfw32/Makefile \ + dlls/msvidc32/Makefile \ + dlls/mswsock/Makefile \ + dlls/msxml3/Makefile \ + dlls/msxml3/tests/Makefile \ + dlls/nddeapi/Makefile \ + dlls/netapi32/Makefile \ + dlls/netapi32/tests/Makefile \ + dlls/newdev/Makefile \ + dlls/ntdll/Makefile \ + dlls/ntdll/tests/Makefile \ + dlls/ntdsapi/Makefile \ + dlls/objsel/Makefile \ + dlls/odbc32/Makefile \ + dlls/odbccp32/Makefile \ + dlls/odbccp32/tests/Makefile \ + dlls/ole32/Makefile \ + dlls/ole32/tests/Makefile \ + dlls/oleacc/Makefile \ + dlls/oleaut32/Makefile \ + dlls/oleaut32/tests/Makefile \ + dlls/olecli32/Makefile \ + dlls/oledlg/Makefile \ + dlls/olepro32/Makefile \ + dlls/olesvr32/Makefile \ + dlls/opengl32/Makefile \ + dlls/powrprof/Makefile \ + dlls/psapi/Makefile \ + dlls/psapi/tests/Makefile \ + dlls/pstorec/Makefile \ + dlls/qcap/Makefile \ + dlls/quartz/Makefile \ + dlls/quartz/tests/Makefile \ + dlls/query/Makefile \ + dlls/rasapi32/Makefile \ + dlls/resutils/Makefile \ + dlls/riched20/Makefile \ + dlls/riched20/tests/Makefile \ + dlls/riched32/Makefile \ + dlls/rpcrt4/Makefile \ + dlls/rpcrt4/tests/Makefile \ + dlls/rsabase/Makefile \ + dlls/rsabase/tests/Makefile \ + dlls/rsaenh/Makefile \ + dlls/rsaenh/tests/Makefile \ + dlls/sane.ds/Makefile \ + dlls/secur32/Makefile \ + dlls/secur32/tests/Makefile \ + dlls/security/Makefile \ + dlls/sensapi/Makefile \ + dlls/serialui/Makefile \ + dlls/serialui/tests/Makefile \ + dlls/setupapi/Makefile \ + dlls/setupapi/tests/Makefile \ + dlls/sfc/Makefile \ + dlls/sfc_os/Makefile \ + dlls/shdoclc/Makefile \ + dlls/shdocvw/Makefile \ + dlls/shdocvw/tests/Makefile \ + dlls/shell32/Makefile \ + dlls/shell32/tests/Makefile \ + dlls/shfolder/Makefile \ + dlls/shlwapi/Makefile \ + dlls/shlwapi/tests/Makefile \ + dlls/snmpapi/Makefile \ + dlls/snmpapi/tests/Makefile \ + dlls/spoolss/Makefile \ + dlls/stdole2.tlb/Makefile \ + dlls/stdole32.tlb/Makefile \ + dlls/sti/Makefile \ + dlls/strmiids/Makefile \ + dlls/svrapi/Makefile \ + dlls/tapi32/Makefile \ + dlls/twain_32/Makefile \ + dlls/unicows/Makefile \ + dlls/url/Makefile \ + dlls/urlmon/Makefile \ + dlls/urlmon/tests/Makefile \ + dlls/user32/Makefile \ + dlls/user32/tests/Makefile \ + dlls/userenv/Makefile \ + dlls/usp10/Makefile \ + dlls/usp10/tests/Makefile \ + dlls/uuid/Makefile \ + dlls/uxtheme/Makefile \ + dlls/uxtheme/tests/Makefile \ + dlls/vdhcp.vxd/Makefile \ + dlls/vdmdbg/Makefile \ + dlls/version/Makefile \ + dlls/version/tests/Makefile \ + dlls/vmm.vxd/Makefile \ + dlls/vnbt.vxd/Makefile \ + dlls/vnetbios.vxd/Makefile \ + dlls/vtdapi.vxd/Makefile \ + dlls/vwin32.vxd/Makefile \ + dlls/w32skrnl/Makefile \ + dlls/winealsa.drv/Makefile \ + dlls/winearts.drv/Makefile \ + dlls/wineaudioio.drv/Makefile \ + dlls/winecoreaudio.drv/Makefile \ + dlls/winecrt0/Makefile \ + dlls/wined3d/Makefile \ + dlls/winedos/Makefile \ + dlls/wineesd.drv/Makefile \ + dlls/winejack.drv/Makefile \ + dlls/winejoystick.drv/Makefile \ + dlls/winemp3.acm/Makefile \ + dlls/winenas.drv/Makefile \ + dlls/wineoss.drv/Makefile \ + dlls/wineps.drv/Makefile \ + dlls/winequartz.drv/Makefile \ + dlls/winex11.drv/Makefile \ + dlls/wing32/Makefile \ + dlls/wininet/Makefile \ + dlls/wininet/tests/Makefile \ + dlls/winmm/Makefile \ + dlls/winmm/tests/Makefile \ + dlls/winnls32/Makefile \ + dlls/winspool.drv/Makefile \ + dlls/winspool.drv/tests/Makefile \ + dlls/wintab32/Makefile \ + dlls/wintrust/Makefile \ + dlls/wintrust/tests/Makefile \ + dlls/wldap32/Makefile \ + dlls/wnaspi32/Makefile \ + dlls/wow32/Makefile \ + dlls/ws2_32/Makefile \ + dlls/ws2_32/tests/Makefile \ + dlls/wsock32/Makefile \ + dlls/wtsapi32/Makefile \ + documentation/Makefile \ + fonts/Makefile \ + include/Makefile \ + libs/Makefile \ + libs/port/Makefile \ + libs/wine/Makefile \ + libs/wpp/Makefile \ + loader/Makefile \ + programs/Makefile \ + programs/clock/Makefile \ + programs/cmd/Makefile \ + programs/cmdlgtst/Makefile \ + programs/control/Makefile \ + programs/eject/Makefile \ + programs/expand/Makefile \ + programs/explorer/Makefile \ + programs/hh/Makefile \ + programs/icinfo/Makefile \ + programs/iexplore/Makefile \ + programs/msiexec/Makefile \ + programs/notepad/Makefile \ + programs/oleview/Makefile \ + programs/progman/Makefile \ + programs/regedit/Makefile \ + programs/regsvr32/Makefile \ + programs/rpcss/Makefile \ + programs/rundll32/Makefile \ + programs/start/Makefile \ + programs/taskmgr/Makefile \ + programs/uninstaller/Makefile \ + programs/view/Makefile \ + programs/wineboot/Makefile \ + programs/winebrowser/Makefile \ + programs/winecfg/Makefile \ + programs/wineconsole/Makefile \ + programs/winedbg/Makefile \ + programs/winefile/Makefile \ + programs/winemenubuilder/Makefile \ + programs/winemine/Makefile \ + programs/winepath/Makefile \ + programs/winetest/Makefile \ + programs/winevdm/Makefile \ + programs/winhelp/Makefile \ + programs/winver/Makefile \ + programs/wordpad/Makefile \ + server/Makefile \ + tools/Makefile \ + tools/widl/Makefile \ + tools/winebuild/Makefile \ + tools/winedump/Makefile \ + tools/winegcc/Makefile \ + tools/wmc/Makefile \ + tools/wrc/Makefile"
cat >confcache <<_ACEOF
On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote:
This long line breaks automated rebasing of one of testing branches on (namely ntoskrnl) on my box every time a new dll or program is added. That's because I need to merge conflict for this line by my hand.
And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical.
The problem is that configure is automatically generated from configure.ac.
Ciao, Marcus
* On Sat, 24 Feb 2007, Marcus Meissner wrote:
- On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote:
And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical.
The problem is that configure is automatically generated from configure.ac.
Well, fair enough. Can its generator be reconfigured then? :)
On Sat, Feb 24, 2007 at 02:31:25PM +0200, Saulius Krasuckas wrote:
- On Sat, 24 Feb 2007, Marcus Meissner wrote:
- On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote:
And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical.
The problem is that configure is automatically generated from configure.ac.
Well, fair enough. Can its generator be reconfigured then? :)
After some experimenting, yes. We can write multiple AC_CONFIG_FILES and they will all get their own line in configure.
Ciao, Marcus
On 24/02/07, Saulius Krasuckas saulius.krasuckas@ieee.org wrote:
This long line breaks automated rebasing of one of testing branches on (namely ntoskrnl) on my box every time a new dll or program is added. That's because I need to merge conflict for this line by my hand.
And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical.
configure | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 325 insertions(+), 1 deletions(-)
configure is a generated file.
On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote:
This long line breaks automated rebasing of one of testing branches on (namely ntoskrnl) on my box every time a new dll or program is added. That's because I need to merge conflict for this line by my hand.
You might find http://wiki.winehq.org/There_are_always_conflicts_in_configure interesting.
Jan
-
H. Verbeet -
Jan Zerebecki -
Marcus Meissner -
Saulius Krasuckas -
Saulius Krasuckas