Attachment #561694 for bug #659652

View | Details | Raw Unified | Return to bug 659652
Collapse All | Expand All





fi

# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-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_prog_GETWINGSFLAGS+set}" = set; then

  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_prog_GETWINGSFLAGS="pkg-config"
    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
  fi

fi

if test -z "$GETWINGSFLAGS"; then
	{ { echo "$as_me:$LINENO: error: 'pkg-config' command was not found in \$PATH." >&5
echo "$as_me: error: 'pkg-config' command was not found in \$PATH." >&2;}
   { (exit 1); exit 1; }; }
fi

WCFLAGS=`pkg-config WINGs --cflags`
WLDFLAGS=`pkg-config WINGs --libs-only-L`
WLIBS=`pkg-config WINGs --libs`







fi

dnl		WINGs support
AC_CHECK_PROG(GETWINGSFLAGS,pkg-config,pkg-config,,[$PATH])
if test -z "$GETWINGSFLAGS"; then
	AC_MSG_ERROR(['pkg-config' command was not found in \$PATH.])
fi

WCFLAGS=`pkg-config WINGs --cflags`
WLDFLAGS=`pkg-config WINGs --libs-only-L`
WLIBS=`pkg-config WINGs --libs`

AC_SUBST(XLIBS)
AC_SUBST(XCFLAGS)

Return to bug 659652

Lines 6312-6319 Link Here

(-)a/configure (-8 / +8 lines)
6312		6312
6313	fi	6313	fi
6314		6314
6315	# Extract the first word of "get-wings-flags", so it can be a program name with args.	6315	# Extract the first word of "pkg-config", so it can be a program name with args.
6316	set dummy get-wings-flags; ac_word=$2	6316	set dummy pkg-config; ac_word=$2
6317	echo "$as_me:$LINENO: checking for $ac_word" >&5	6317	echo "$as_me:$LINENO: checking for $ac_word" >&5
6318	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6	6318	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6319	if test "${ac_cv_prog_GETWINGSFLAGS+set}" = set; then	6319	if test "${ac_cv_prog_GETWINGSFLAGS+set}" = set; then
Lines 6329-6335 Link Here
6329	test -z "$as_dir" && as_dir=.	6329	test -z "$as_dir" && as_dir=.
6330	for ac_exec_ext in '' $ac_executable_extensions; do	6330	for ac_exec_ext in '' $ac_executable_extensions; do
6331	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then	6331	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6332	ac_cv_prog_GETWINGSFLAGS="get-wings-flags"	6332	ac_cv_prog_GETWINGSFLAGS="pkg-config"
6333	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5	6333	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6334	break 2	6334	break 2
6335	fi	6335	fi
Lines 6348-6361 Link Here
6348	fi	6348	fi
6349		6349
6350	if test -z "$GETWINGSFLAGS"; then	6350	if test -z "$GETWINGSFLAGS"; then
6351	{ { echo "$as_me:$LINENO: error: 'get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker." >&5	6351	{ { echo "$as_me:$LINENO: error: 'pkg-config' command was not found in \$PATH." >&5
6352	echo "$as_me: error: 'get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker." >&2;}	6352	echo "$as_me: error: 'pkg-config' command was not found in \$PATH." >&2;}
6353	{ (exit 1); exit 1; }; }	6353	{ (exit 1); exit 1; }; }
6354	fi	6354	fi
6355		6355
6356	WCFLAGS=`get-wings-flags --cflags`	6356	WCFLAGS=`pkg-config WINGs --cflags`
6357	WLDFLAGS=`get-wings-flags --ldflags`	6357	WLDFLAGS=`pkg-config WINGs --libs-only-L`
6358	WLIBS=`get-wings-flags --libs`	6358	WLIBS=`pkg-config WINGs --libs`
6359		6359
6360		6360
6361		6361

Lines 154-167 Link Here

(-)a/configure.ac (-5 / +5 lines)
154	fi	154	fi
155		155
156	dnl WINGs support	156	dnl WINGs support
157	AC_CHECK_PROG(GETWINGSFLAGS,get-wings-flags,get-wings-flags,,[$PATH])	157	AC_CHECK_PROG(GETWINGSFLAGS,pkg-config,pkg-config,,[$PATH])
158	if test -z "$GETWINGSFLAGS"; then	158	if test -z "$GETWINGSFLAGS"; then
159	AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.])	159	AC_MSG_ERROR(['pkg-config' command was not found in \$PATH.])
160	fi	160	fi
161		161
162	WCFLAGS=`get-wings-flags --cflags`	162	WCFLAGS=`pkg-config WINGs --cflags`
163	WLDFLAGS=`get-wings-flags --ldflags`	163	WLDFLAGS=`pkg-config WINGs --libs-only-L`
164	WLIBS=`get-wings-flags --libs`	164	WLIBS=`pkg-config WINGs --libs`
165		165
166	AC_SUBST(XLIBS)	166	AC_SUBST(XLIBS)
167	AC_SUBST(XCFLAGS)	167	AC_SUBST(XCFLAGS)