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

(-)file_not_specified_in_diff (-3 / +24 lines)
Line  Link Here
0
-- configure.in
0
++ configure.in
Lines 91-96 Link Here
91
AC_CHECK_FUNCS(vsyslog syslog)
91
AC_CHECK_FUNCS(vsyslog syslog)
92
AC_FUNC_ALLOCA
92
AC_FUNC_ALLOCA
93
93
94
AC_MSG_CHECKING(for ceil)
95
AC_TRY_LINK([#include <math.h>
96
             double d;],
97
	    [d = ceil(1.0);],
98
	    SYNLDFLAGS=""
99
	    AC_MSG_RESULT(yes),
100
	    SYNLDFLAGS=-lm
101
	    AC_MSG_RESULT(no))
102
	     
103
if test "$SYNLDFLAGS" = "-lm" ; then
104
    SAVE_LIBS="$LIBS"
105
    AC_CHECK_LIB(m,
106
                 ceil,
107
		 ,
108
		 echo "libmath.so is needed due the ceil function"
109
		 exit 1)
110
    LIBS="$SAVE_LIBS"
111
fi
112
94
case $with_curses in
113
case $with_curses in
95
No|no|N|n) SHARED_LIBS=-lc ;;
114
No|no|N|n) SHARED_LIBS=-lc ;;
96
*)
115
*)
Lines 123-128 Link Here
123
AC_SUBST(SHLIB)
142
AC_SUBST(SHLIB)
124
AC_SUBST(PICFLAGS)
143
AC_SUBST(PICFLAGS)
125
AC_SUBST(SOLDFLAGS)
144
AC_SUBST(SOLDFLAGS)
145
AC_SUBST(SYNLDFLAGS)
126
AC_SUBST(CURSES_OBJS)
146
AC_SUBST(CURSES_OBJS)
127
AC_SUBST(SHARED_LIBS)
147
AC_SUBST(SHARED_LIBS)
128
AC_SUBST(lispdir)
148
AC_SUBST(lispdir)
129
-- src/Makefile.in
149
++ src/Makefile.in
Lines 70-75 Link Here
70
all:	gpm lib/@SHLIB@ lib/libgpm.a $(PROG)
70
all:	gpm lib/@SHLIB@ lib/libgpm.a $(PROG)
71
71
72
gpm:	$(GOBJ)
72
gpm:	$(GOBJ)
73
	$(CC) @LDFLAGS@ @SYNLDFLAGS@ $(GOBJ) -o gpm
73
74
74
# construct dependings of sourcefiles and link sourcefiles
75
# construct dependings of sourcefiles and link sourcefiles
75
$(DEPFILE) dep: prog/gpm-root.c
76
$(DEPFILE) dep: prog/gpm-root.c
Lines 154-160 Link Here
154
155
155
lib/libgpm.so.@abi_full@:	$(PICS)
156
lib/libgpm.so.@abi_full@:	$(PICS)
156
	$(CC) @SOLDFLAGS@libgpm.so.@abi_lev@ \
157
	$(CC) @SOLDFLAGS@libgpm.so.@abi_lev@ \
157
	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)	
158
	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ @SYNLDFLAGS@ $(LIBS)	
158
lib/libgpm.so:	lib/libgpm.so.@abi_full@
159
lib/libgpm.so:	lib/libgpm.so.@abi_full@
159
	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
160
	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
160
161

Return to bug 4863