Commit 4b1ba6eb authored by Alan Coopersmith's avatar Alan Coopersmith

Quote $ac_cv_search_* variables to prevent errors from test when they are set...

Quote $ac_cv_search_* variables to prevent errors from test when they are set to "none required" (as happens on Solaris since dlopen is in libc)
Comment out "override CC = gcc" line as it breaks builds with non-GNU makes, and its incorrect to force a specific compiler. Change LINK line from gcc to $(CC).
parent 1d425d5e
2005-05-20 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac: Quote $ac_cv_search_* variables to prevent errors
from test when they are set to "none required" (as happens on Solaris
since dlopen is in libc)
* util/src/Makefile.am: Comment out "override CC = gcc" line as it
breaks builds with non-GNU makes, and its incorrect to force a
specific compiler. Change LINK line from gcc to $(CC).
Tue May 17 18:31:08 2005 Søren Sandmann <sandmann@redhat.com>
* configure.ac (XPROTO_LIBS): Check for xproto as its CFLAGS are
......
......@@ -49,9 +49,9 @@ fi
# Check for dlopen
AC_SEARCH_LIBS(dlopen,[dl svld])
if test x$ac_cv_search_dlopen = xno; then
if test "x$ac_cv_search_dlopen" = xno; then
AC_SEARCH_LIBS(shl_load,[dld])
if test x$ac_cv_search_shl_load != xno; then
if test "x$ac_cv_search_shl_load" != xno; then
AC_DEFINE(HAVE_SHL_LOAD,1,
[Use shl_load to load shared libraries])
AC_CHECK_HEADERS([dl.h])
......
# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.2 2005-05-21 04:26:12 alanc Exp $
noinst_PROGRAMS=makekeys
makekeys_CFLAGS=$(X11_CFLAGS) $(BIGREQS_CFLAGS)
override CC = gcc
LINK = gcc $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
#override CC = gcc
LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment