From cdb68deb01067fab82e2449ccde2794158ed7da9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 10 Jul 2010 20:39:17 +0000 Subject: [PATCH] Syntax error fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 16 ++++++++-------- configure.in | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 82b279f611..fb4ea18826 100755 --- a/configure +++ b/configure @@ -16843,7 +16843,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_prog_gcc_traditional=no fi -rm -f conftest* +rm -f -r conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -16860,7 +16860,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -f -r conftest* fi fi @@ -18659,7 +18659,7 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" else MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" - endif + fi eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" @@ -19469,7 +19469,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -f -r conftest* fi @@ -19490,7 +19490,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -f -r conftest* fi @@ -24386,7 +24386,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f conftest* +rm -f -r conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. @@ -31100,7 +31100,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do + for ac_extension in a so sl dylib la dll; do if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break @@ -31253,7 +31253,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do + for ac_extension in a so sl dylib la dll; do if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 diff --git a/configure.in b/configure.in index 336b340af2..2d0a0a7dfc 100644 --- a/configure.in +++ b/configure.in @@ -1291,7 +1291,7 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" else MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" - endif + fi eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""