1.1 --- a/pre-inst/Makefile.am	Sat Nov 15 19:04:45 2014 +0000
     1.2 +++ b/pre-inst/Makefile.am	Fri Apr 15 13:09:11 2016 +0100
     1.3 @@ -9,11 +9,13 @@
     1.4  AM_LDFLAGS=-mwindows
     1.5  endif
     1.6  INCLUDES=-I$(top_srcdir) -I$(srcdir)
     1.7 +CCLD = $(CXX)
     1.8  
     1.9  bin_PROGRAMS=pre-inst
    1.10  
    1.11  pre_inst_SOURCES=pre-inst.c
    1.12  pre_inst_LDFLAGS=$(AM_LDFLAGS) -all-static
    1.13 +pre_inst_LIBTOOLFLAGS=--tag=CXX
    1.14  if HAVE_WINDRES
    1.15  pre_inst_SOURCES+=resources.rc pre-inst.exe.manifest resource.h
    1.16  endif