Ticket #13901: patch-configure.diff

configure

@@ -2675 +2675 @@
 
 fi;
 
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 case "$host" in
 *-apple-darwin*)
@@ -2695 +2694 @@
  gww_define_caps_for_alt="1"
 
 
- CPPFLAGS="$CPPFLAGS -I/sw/include"
- LDFLAGS="$LDFLAGS -L/sw/lib"
- gww_rpath="-rpath /sw/lib"
+ CPPFLAGS="$CPPFLAGS -I@@PREFIX@@/include"
+ LDFLAGS="$LDFLAGS -L@@PREFIX@@/lib"
+ gww_rpath="-rpath @@PREFIX@@/lib"
  LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS"
 
  ;;
@@ -19171 +19170 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for /usr/include/libxml2/libxml" >&5
-echo $ECHO_N "checking for /usr/include/libxml2/libxml... $ECHO_C" >&6
-if test "${ac_cv_file__usr_include_libxml2_libxml+set}" = set; then
+echo "$as_me:$LINENO: checking for @@PREFIX@@/include/libxml2/libxml" >&5
+echo $ECHO_N "checking for @@PREFIX@@/include/libxml2/libxml... $ECHO_C" >&6
+if test "${ac_cv_file__opt_local_include_libxml2_libxml+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "/usr/include/libxml2/libxml"; then
-  ac_cv_file__usr_include_libxml2_libxml=yes
+if test -r "@@PREFIX@@/include/libxml2/libxml"; then
+  ac_cv_file__opt_local_include_libxml2_libxml=yes
 else
-  ac_cv_file__usr_include_libxml2_libxml=no
+  ac_cv_file__opt_local_include_libxml2_libxml=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_libxml2_libxml" >&5
-echo "${ECHO_T}$ac_cv_file__usr_include_libxml2_libxml" >&6
-if test $ac_cv_file__usr_include_libxml2_libxml = yes; then
-  CFLAGS="$CFLAGS -I/usr/include/libxml2/"
-else
-
- echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
-if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "/usr/local/include/libxml2/libxml"; then
-  ac_cv_file__usr_local_include_libxml2_libxml=yes
-else
-  ac_cv_file__usr_local_include_libxml2_libxml=no
-fi
+echo "$as_me:$LINENO: result: $ac_cv_file__opt_local_include_libxml2_libxml" >&5
+echo "${ECHO_T}$ac_cv_file__opt_local_include_libxml2_libxml" >&6
+if test $ac_cv_file__opt_local_include_libxml2_libxml = yes; then
+  CFLAGS="$CFLAGS -I@@PREFIX@@/include -I@@PREFIX@@/include/libxml2/"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
-echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
-if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
-  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
-else
-  cat >>confdefs.h <<\_ACEOF
-#define _NO_LIBXML 1
-_ACEOF
-
-fi
-
-fi
-
 
 
 echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5