Skip to content

Instantly share code, notes, and snippets.

@codeman38
Created June 10, 2011 17:45
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save codeman38/1019341 to your computer and use it in GitHub Desktop.
Save codeman38/1019341 to your computer and use it in GitHub Desktop.
Patch to configure file for compiling psftools on OS X.
diff --git a/configure b/configure
index 59c44df..c43d74e 100755
--- a/configure
+++ b/configure
@@ -903,7 +903,7 @@ else
{ echo "configure: error: newly created file is older than distributed files!
Check your system clock" 1>&2; exit 1; }
fi
-rm -f conftest*
+rm -rf conftest*
echo "$ac_t""yes" 1>&6
if test "$program_transform_name" = s,x,x,; then
program_transform_name=
@@ -1241,7 +1241,7 @@ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
else
ac_cv_prog_cc_g=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
@@ -1390,8 +1390,8 @@ else
rm -rf conftest*
ac_cv_cygwin=no
fi
-rm -f conftest*
-rm -f conftest*
+rm -rf conftest*
+rm -rf conftest*
fi
echo "$ac_t""$ac_cv_cygwin" 1>&6
@@ -1419,8 +1419,8 @@ else
rm -rf conftest*
ac_cv_mingw32=no
fi
-rm -f conftest*
-rm -f conftest*
+rm -rf conftest*
+rm -rf conftest*
fi
echo "$ac_t""$ac_cv_mingw32" 1>&6
@@ -1493,11 +1493,11 @@ else
rm -rf conftest*
CPP=/lib/cpp
fi
-rm -f conftest*
+rm -rf conftest*
fi
-rm -f conftest*
+rm -rf conftest*
fi
-rm -f conftest*
+rm -rf conftest*
ac_cv_prog_CPP="$CPP"
fi
CPP="$ac_cv_prog_CPP"
@@ -2017,7 +2017,7 @@ echo "configure:2017: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- rm -f conftest*
+ rm -rf conftest*
echo 'int i = 1;' > conftest.$ac_ext
if { (eval echo configure:2023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
@@ -2029,7 +2029,7 @@ if { (eval echo configure:2023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
else
{ echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
fi
-rm -f conftest*
+rm -rf conftest*
fi
echo "$ac_t""$ac_cv_objext" 1>&6
@@ -2046,20 +2046,20 @@ else
if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
ac_cv_exeext=.exe
else
- rm -f conftest*
+ rm -rf conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
- *.c | *.o | *.obj) ;;
+ *.c | *.o | *.obj | *.dSYM) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac
done
else
{ echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
fi
- rm -f conftest*
+ rm -rf conftest*
test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
fi
fi
@@ -2150,7 +2150,7 @@ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*
# Check to see that the pipe works correctly.
pipe_works=no
- rm -f conftest*
+ rm -rf conftest*
cat > conftest.$ac_ext <<EOF
#ifdef __cplusplus
extern "C" {
@@ -2235,7 +2235,7 @@ EOF
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -2288,7 +2288,7 @@ else
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -2658,7 +2658,7 @@ else
rm -rf conftest*
lt_cv_cc_needs_belf=no
fi
-rm -f conftest*
+rm -rf conftest*
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
@@ -2983,7 +2983,7 @@ else
lt_cv_prog_cc_pic_works=no
fi
-rm -f conftest*
+rm -rf conftest*
CFLAGS="$save_CFLAGS"
fi
@@ -3032,7 +3032,7 @@ else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
-rm -f conftest*
+rm -rf conftest*
LDFLAGS="$save_LDFLAGS"
fi
@@ -3132,7 +3132,7 @@ else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
-rm -f conftest*
+rm -rf conftest*
ac_objext="$save_objext"
CFLAGS="$save_CFLAGS"
@@ -3195,7 +3195,7 @@ else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
-rm -f conftest*
+rm -rf conftest*
CFLAGS="$save_CFLAGS"
echo "$ac_t""$compiler_rtti_exceptions" 1>&6
@@ -4472,7 +4472,7 @@ else
rm -rf conftest*
eval "ac_cv_func_shl_load=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
@@ -4509,7 +4509,7 @@ else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest*
+rm -rf conftest*
LIBS="$ac_save_LIBS"
fi
@@ -4556,7 +4556,7 @@ else
rm -rf conftest*
eval "ac_cv_func_dlopen=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
@@ -4593,7 +4593,7 @@ else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest*
+rm -rf conftest*
LIBS="$ac_save_LIBS"
fi
@@ -4631,7 +4631,7 @@ else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest*
+rm -rf conftest*
LIBS="$ac_save_LIBS"
fi
@@ -4669,7 +4669,7 @@ else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest*
+rm -rf conftest*
LIBS="$ac_save_LIBS"
fi
@@ -5565,7 +5565,7 @@ else
rm -rf conftest*
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -rf conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -5581,7 +5581,7 @@ else
rm -rf conftest*
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
@@ -5599,7 +5599,7 @@ else
rm -rf conftest*
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
@@ -5669,7 +5669,7 @@ else
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -5724,7 +5724,7 @@ else
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
@@ -5804,7 +5804,7 @@ else
rm -rf conftest*
ac_cv_c_const=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
echo "$ac_t""$ac_cv_c_const" 1>&6
@@ -5837,7 +5837,7 @@ else
rm -rf conftest*
ac_cv_type_size_t=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
echo "$ac_t""$ac_cv_type_size_t" 1>&6
@@ -5858,20 +5858,20 @@ else
if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
ac_cv_exeext=.exe
else
- rm -f conftest*
+ rm -rf conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
if { (eval echo configure:5865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
- *.c | *.o | *.obj) ;;
+ *.c | *.o | *.obj | *.dSYM) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac
done
else
{ echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
fi
- rm -f conftest*
+ rm -rf conftest*
test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
fi
fi
@@ -5886,7 +5886,7 @@ echo "configure:5886: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- rm -f conftest*
+ rm -rf conftest*
echo 'int i = 1;' > conftest.$ac_ext
if { (eval echo configure:5892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
@@ -5898,7 +5898,7 @@ if { (eval echo configure:5892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
else
{ echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
fi
-rm -f conftest*
+rm -rf conftest*
fi
echo "$ac_t""$ac_cv_objext" 1>&6
@@ -5927,7 +5927,7 @@ else
rm -rf conftest*
ac_cv_prog_gcc_traditional=no
fi
-rm -f conftest*
+rm -rf conftest*
if test $ac_cv_prog_gcc_traditional = no; then
@@ -5942,7 +5942,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
rm -rf conftest*
ac_cv_prog_gcc_traditional=yes
fi
-rm -f conftest*
+rm -rf conftest*
fi
fi
@@ -5975,7 +5975,7 @@ else
rm -rf conftest*
ac_cv_header_sys_types_h_makedev=no
fi
-rm -f conftest*
+rm -rf conftest*
fi
@@ -6006,7 +6006,7 @@ else
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -6044,7 +6044,7 @@ else
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -6135,7 +6135,7 @@ else
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
-rm -f conftest*
+rm -rf conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment