bartvdrmeulen@2018: --- mingw-libgnurx-2.5.1.orig/configure	2009-11-03 08:19:15.000000000 +0100
bartvdrmeulen@2018: +++ mingw-libgnurx-2.5.1/configure	2009-11-03 08:31:37.000000000 +0100
bartvdrmeulen@2018: @@ -273,7 +273,7 @@
bartvdrmeulen@2018:  PACKAGE_STRING='MinGW libgnurx 2.5.1'
bartvdrmeulen@2018:  PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=2435&atid=102435'
bartvdrmeulen@2018: 
bartvdrmeulen@2018: -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CC_QUALIFIED DLLVERSION ZIPCMD ZIPEXT MSVCLIB ac_ct_MSVCLIB GNURX_LIB install_dev LIBOBJS LTLIBOBJS'
bartvdrmeulen@2018: +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CC_QUALIFIED AR DLLVERSION ZIPCMD ZIPEXT MSVCLIB ac_ct_MSVCLIB GNURX_LIB install_dev LIBOBJS LTLIBOBJS'
bartvdrmeulen@2018:  ac_subst_files=''
bartvdrmeulen@2018: 
bartvdrmeulen@2018:  # Initialize some variables set by options.
bartvdrmeulen@2018: @@ -2190,21 +2190,54 @@
bartvdrmeulen@2018: 
bartvdrmeulen@2018:  fi
bartvdrmeulen@2018:  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
bartvdrmeulen@2018: -ac_ext=c
bartvdrmeulen@2018: -ac_cpp='$CPP $CPPFLAGS'
bartvdrmeulen@2018: -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
bartvdrmeulen@2018: -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
bartvdrmeulen@2018: -ac_compiler_gnu=$ac_cv_c_compiler_gnu
bartvdrmeulen@2018: 
bartvdrmeulen@2018: -  ac_ext=c
bartvdrmeulen@2018: +
bartvdrmeulen@2018: +for ac_prog in ar; do
bartvdrmeulen@2018: +set dummy ${ac_tool_prefix}$ac_prog; ac_word=$2
bartvdrmeulen@2018: +echo "$as_me:$LINENO: checking for $ac_word" >&5
bartvdrmeulen@2018: +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
bartvdrmeulen@2018: +if test "${ac_cv_prog_AR+set}" = set; then
bartvdrmeulen@2018: +  echo $ECHO_N "(cached) $ECHO_C" >&6
bartvdrmeulen@2018: +else
bartvdrmeulen@2018: +  if test -n "$AR"; then
bartvdrmeulen@2018: +  ac_cv_prog_AR="$AR" # Let the user override the test.
bartvdrmeulen@2018: +else
bartvdrmeulen@2018: +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
bartvdrmeulen@2018: +for as_dir in $PATH
bartvdrmeulen@2018: +do
bartvdrmeulen@2018: +  IFS=$as_save_IFS
bartvdrmeulen@2018: +  test -z "$as_dir" && as_dir=.
bartvdrmeulen@2018: +  for ac_exec_ext in '' $ac_executable_extensions; do
bartvdrmeulen@2018: +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
bartvdrmeulen@2018: +    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
bartvdrmeulen@2018: +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
bartvdrmeulen@2018: +    break 2
bartvdrmeulen@2018: +  fi
bartvdrmeulen@2018: +done
bartvdrmeulen@2018: +done
bartvdrmeulen@2018: +
bartvdrmeulen@2018: +  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
bartvdrmeulen@2018: +fi
bartvdrmeulen@2018: +fi
bartvdrmeulen@2018: +AR=$ac_cv_prog_AR
bartvdrmeulen@2018: +if test -n "$AR"; then
bartvdrmeulen@2018: +  echo "$as_me:$LINENO: result: $AR" >&5
bartvdrmeulen@2018: +echo "${ECHO_T}$AR" >&6
bartvdrmeulen@2018: +else
bartvdrmeulen@2018: +  echo "$as_me:$LINENO: result: no" >&5
bartvdrmeulen@2018: +echo "${ECHO_T}no" >&6
bartvdrmeulen@2018: +fi
bartvdrmeulen@2018: +done
bartvdrmeulen@2018: +
bartvdrmeulen@2018: +ac_ext=c
bartvdrmeulen@2018:  ac_cpp='$CPP $CPPFLAGS'
bartvdrmeulen@2018:  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
bartvdrmeulen@2018:  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
bartvdrmeulen@2018:  ac_compiler_gnu=$ac_cv_c_compiler_gnu
bartvdrmeulen@2018: 
bartvdrmeulen@2018: - popCFLAGS=$CFLAGS
bartvdrmeulen@2018: - echo 'int main(void){return 0;}' > conftest.$ac_ext
bartvdrmeulen@2018: - echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5
bartvdrmeulen@2018: +popCFLAGS=$CFLAGS
bartvdrmeulen@2018: +echo 'int main(void){return 0;}' > conftest.$ac_ext
bartvdrmeulen@2018: +echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5
bartvdrmeulen@2018:  echo $ECHO_N "checking whether $CC accepts the -mthreads option... $ECHO_C" >&6
bartvdrmeulen@2018:     CFLAGS="$popCFLAGS $CC_QUALIFIED -mthreads"
bartvdrmeulen@2018:     if (eval $ac_compile) 2>&5; then
bartvdrmeulen@2018: @@ -3038,6 +3069,7 @@
bartvdrmeulen@2018:  s,@EXEEXT@,$EXEEXT,;t t
bartvdrmeulen@2018:  s,@OBJEXT@,$OBJEXT,;t t
bartvdrmeulen@2018:  s,@CC_QUALIFIED@,$CC_QUALIFIED,;t t
bartvdrmeulen@2018: +s,@AR@,$AR,;t t
bartvdrmeulen@2018:  s,@DLLVERSION@,$DLLVERSION,;t t
bartvdrmeulen@2018:  s,@ZIPCMD@,$ZIPCMD,;t t
bartvdrmeulen@2018:  s,@ZIPEXT@,$ZIPEXT,;t t
bartvdrmeulen@2018: --- mingw-libgnurx-2.5.1.orig/Makefile.in	2009-11-03 08:17:49.000000000 +0100
bartvdrmeulen@2018: +++ mingw-libgnurx-2.5.1/Makefile.in	2009-11-03 08:57:37.000000000 +0100
bartvdrmeulen@2018: @@ -39,6 +39,7 @@
bartvdrmeulen@2018:  mandir = @mandir@
bartvdrmeulen@2018: 
bartvdrmeulen@2018:  CC = @CC_QUALIFIED@
bartvdrmeulen@2018: +AR = @AR@
bartvdrmeulen@2018:  CFLAGS = @CFLAGS@ -I ${srcdir}
bartvdrmeulen@2018:  LDFLAGS = @LDFLAGS@
bartvdrmeulen@2018: 
bartvdrmeulen@2018: @@ -67,8 +68,8 @@
bartvdrmeulen@2018:  libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJECTS)
bartvdrmeulen@2018:  	$(CC) $(CFLAGS) -shared -o libgnurx-$(DLLVERSION).dll $(LDFLAGS) $(OBJECTS)
bartvdrmeulen@2018: 
bartvdrmeulen@2018: -libregex.a: libgnurx.dll.a
bartvdrmeulen@2018: -	cp -p libgnurx.dll.a $@
bartvdrmeulen@2018: +libregex.a: $(OBJECTS)
bartvdrmeulen@2018: +	$(AR) cru $@ $(OBJECTS)
bartvdrmeulen@2018: 
bartvdrmeulen@2018:  gnurx.lib: libgnurx-$(DLLVERSION).dll