Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > ea7710e9d88b1b05b8d30c36cfe50a68 > files > 1

xcdroast-0.98-0.a15.39mdv2010.1.src.rpm

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_upstream_configure.dpatch by  <Hector Garcia <hector@debian.org>>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/configure trunk/configure
--- trunk~/configure	2006-01-20 13:34:14.000000000 +0100
+++ trunk/configure	2006-01-20 13:51:55.000000000 +0100
@@ -4361,55 +4361,6 @@
 	LIBS="$LIBS $PKGCONFIG_LIBS"
 	CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS"
 
-	# Extract the first word of "pcre-config", so it can be a program name with args.
-set dummy pcre-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PCRE_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="no"
-  ;;
-esac
-fi
-PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
-
-if test -n "$PCRE_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
-echo "${ECHO_T}$PCRE_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-	if test "x$PCRE_CONFIG" = "xno" ; then
-        	{ { echo "$as_me:$LINENO: error: pcre-config not found please install libpcre3-dev or similar" >&5
-echo "$as_me: error: pcre-config not found please install libpcre3-dev or similar" >&2;}
-   { (exit 1); exit 1; }; }
-	else
-        	LIBS="$LIBS `$PCRE_CONFIG --libs`"
-        	CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
-	fi
-
 else
 
 
@@ -9249,7 +9200,6 @@
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@PKGCONFIG_CFLAGS@,$PKGCONFIG_CFLAGS,;t t
 s,@PKGCONFIG_LIBS@,$PKGCONFIG_LIBS,;t t
-s,@PCRE_CONFIG@,$PCRE_CONFIG,;t t
 s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
diff -urNad trunk~/configure.in trunk/configure.in
--- trunk~/configure.in	2006-01-20 13:34:14.000000000 +0100
+++ trunk/configure.in	2006-01-20 13:51:58.000000000 +0100
@@ -105,14 +105,6 @@
 	LIBS="$LIBS $PKGCONFIG_LIBS"
 	CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS"
 
-	AC_PATH_PROG(PCRE_CONFIG, pcre-config, no)
-	if test "x$PCRE_CONFIG" = "xno" ; then
-        	AC_MSG_ERROR(pcre-config not found please install libpcre3-dev or similar)
-	else 
-        	LIBS="$LIBS `$PCRE_CONFIG --libs`"
-        	CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
-	fi
-
 else 
 	dnl pure plain GTK+-1.2.x support