Ticket #13901: patch-configure.diff

File patch-configure.diff, 3.2 KB (added by blb@…, 17 years ago)

files/patch-configure.diff

  • configure

    old new  
    26752675
    26762676fi;
    26772677
    2678 LDFLAGS="$LDFLAGS -L/usr/local/lib"
    26792678
    26802679case "$host" in
    26812680*-apple-darwin*)
     
    26952694 gww_define_caps_for_alt="1"
    26962695
    26972696
    2698  CPPFLAGS="$CPPFLAGS -I/sw/include"
    2699  LDFLAGS="$LDFLAGS -L/sw/lib"
    2700  gww_rpath="-rpath /sw/lib"
     2697 CPPFLAGS="$CPPFLAGS -I@@PREFIX@@/include"
     2698 LDFLAGS="$LDFLAGS -L@@PREFIX@@/lib"
     2699 gww_rpath="-rpath @@PREFIX@@/lib"
    27012700 LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
    27022701
    27032702 ;;
     
    1917119170
    1917219171fi
    1917319172
    19174 echo "$as_me:$LINENO: checking for /usr/include/libxml2/libxml" >&5
    19175 echo $ECHO_N "checking for /usr/include/libxml2/libxml... $ECHO_C" >&6
    19176 if test "${ac_cv_file__usr_include_libxml2_libxml+set}" = set; then
     19173echo "$as_me:$LINENO: checking for @@PREFIX@@/include/libxml2/libxml" >&5
     19174echo $ECHO_N "checking for @@PREFIX@@/include/libxml2/libxml... $ECHO_C" >&6
     19175if test "${ac_cv_file__opt_local_include_libxml2_libxml+set}" = set; then
    1917719176  echo $ECHO_N "(cached) $ECHO_C" >&6
    1917819177else
    1917919178  test "$cross_compiling" = yes &&
    1918019179  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    1918119180echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    1918219181   { (exit 1); exit 1; }; }
    19183 if test -r "/usr/include/libxml2/libxml"; then
    19184   ac_cv_file__usr_include_libxml2_libxml=yes
     19182if test -r "@@PREFIX@@/include/libxml2/libxml"; then
     19183  ac_cv_file__opt_local_include_libxml2_libxml=yes
    1918519184else
    19186   ac_cv_file__usr_include_libxml2_libxml=no
     19185  ac_cv_file__opt_local_include_libxml2_libxml=no
    1918719186fi
    1918819187fi
    19189 echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_libxml2_libxml" >&5
    19190 echo "${ECHO_T}$ac_cv_file__usr_include_libxml2_libxml" >&6
    19191 if test $ac_cv_file__usr_include_libxml2_libxml = yes; then
    19192   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
    19193 else
    19194 
    19195  echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
    19196 echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
    19197 if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
    19198   echo $ECHO_N "(cached) $ECHO_C" >&6
    19199 else
    19200   test "$cross_compiling" = yes &&
    19201   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    19202 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    19203    { (exit 1); exit 1; }; }
    19204 if test -r "/usr/local/include/libxml2/libxml"; then
    19205   ac_cv_file__usr_local_include_libxml2_libxml=yes
    19206 else
    19207   ac_cv_file__usr_local_include_libxml2_libxml=no
    19208 fi
     19188echo "$as_me:$LINENO: result: $ac_cv_file__opt_local_include_libxml2_libxml" >&5
     19189echo "${ECHO_T}$ac_cv_file__opt_local_include_libxml2_libxml" >&6
     19190if test $ac_cv_file__opt_local_include_libxml2_libxml = yes; then
     19191  CFLAGS="$CFLAGS -I@@PREFIX@@/include -I@@PREFIX@@/include/libxml2/"
    1920919192fi
    19210 echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
    19211 echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
    19212 if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
    19213   CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
    19214 else
    19215   cat >>confdefs.h <<\_ACEOF
    19216 #define _NO_LIBXML 1
    19217 _ACEOF
    19218 
    19219 fi
    19220 
    19221 fi
    19222 
    1922319193
    1922419194
    1922519195echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5