Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 203672 | Differences between
and this patch

Collapse All | Expand All

(-)nano-2.0.7/configure.ac.bak (-26 / +26 lines)
Lines 206-212 AC_ARG_WITH(slang, Link Here
206
	    AC_CHECK_HEADER(slcurses.h,
206
	    AC_CHECK_HEADER(slcurses.h,
207
		AC_MSG_CHECKING([for SLutf8_enable in -lslang])
207
		AC_MSG_CHECKING([for SLutf8_enable in -lslang])
208
		_libs=$LIBS
208
		_libs=$LIBS
209
		LIBS="$LIBS -lslang"
209
		LIBS="$LIBS -lslang-2"
210
		AC_TRY_RUN([
210
		AC_TRY_RUN([
211
#include <slcurses.h>
211
#include <slcurses.h>
212
int main(void)
212
int main(void)
Lines 218-228 int main(void) Link Here
218
		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
218
		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
219
		    CURSES_LIB_WIDE=yes
219
		    CURSES_LIB_WIDE=yes
220
		    if test x$with_slang != xyes; then
220
		    if test x$with_slang != xyes; then
221
			CURSES_LIB="-L${with_slang}/lib -lslang"
221
			CURSES_LIB="-L${with_slang}/lib -lslang-2"
222
		    else
222
		    else
223
			CURSES_LIB="-lslang"
223
			CURSES_LIB="-lslang-2"
224
		    fi
224
		    fi
225
		    CURSES_LIB_NAME=slang],
225
		    CURSES_LIB_NAME=slang-2],
226
		    [AC_MSG_RESULT(no)
226
		    [AC_MSG_RESULT(no)
227
227
228
		    # We might need the term library
228
		    # We might need the term library
Lines 231-237 int main(void) Link Here
231
			test -n "$tcap" && break
231
			test -n "$tcap" && break
232
		    done
232
		    done
233
233
234
		    AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap])
234
		    AC_MSG_CHECKING([for SLutf8_enable in -lslang-2 $tcap])
235
		    LIBS="$LIBS $tcap"
235
		    LIBS="$LIBS $tcap"
236
		    AC_TRY_RUN([
236
		    AC_TRY_RUN([
237
#include <slcurses.h>
237
#include <slcurses.h>
Lines 244-258 int main(void) Link Here
244
			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
244
			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
245
			CURSES_LIB_WIDE=yes
245
			CURSES_LIB_WIDE=yes
246
			if test x$with_slang != xyes; then
246
			if test x$with_slang != xyes; then
247
			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
247
			    CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap"
248
			else
248
			else
249
			    CURSES_LIB="-lslang $tcap"
249
			    CURSES_LIB="-lslang-2 $tcap"
250
			fi
250
			fi
251
			CURSES_LIB_NAME=slang],
251
			CURSES_LIB_NAME=slang-2],
252
			[AC_MSG_RESULT(no)
252
			[AC_MSG_RESULT(no)
253
253
254
			# We might need the math library
254
			# We might need the math library
255
			AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
255
			AC_MSG_CHECKING([for SLutf8_enable in -lslang-2 $tcap -lm])
256
			LIBS="$LIBS -lm"
256
			LIBS="$LIBS -lm"
257
			AC_TRY_RUN([
257
			AC_TRY_RUN([
258
#include <slcurses.h>
258
#include <slcurses.h>
Lines 265-275 int main(void) Link Here
265
			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
265
			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
266
			    CURSES_LIB_WIDE=yes
266
			    CURSES_LIB_WIDE=yes
267
			    if test x$with_slang != xyes; then
267
			    if test x$with_slang != xyes; then
268
				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
268
				CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap -lm"
269
			    else
269
			    else
270
				CURSES_LIB="-lslang $tcap -lm"
270
				CURSES_LIB="-lslang-2 $tcap -lm"
271
			    fi
271
			    fi
272
			    CURSES_LIB_NAME=slang],
272
			    CURSES_LIB_NAME=slang-2],
273
			    [AC_MSG_RESULT(no)],
273
			    [AC_MSG_RESULT(no)],
274
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
274
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
275
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
275
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
Lines 288-296 int main(void) Link Here
288
	    fi
288
	    fi
289
289
290
	    AC_CHECK_HEADER(slcurses.h,
290
	    AC_CHECK_HEADER(slcurses.h,
291
		AC_MSG_CHECKING([for SLtt_initialize in -lslang])
291
		AC_MSG_CHECKING([for SLtt_initialize in -lslang-2])
292
		_libs=$LIBS
292
		_libs=$LIBS
293
		LIBS="$LIBS -lslang"
293
		LIBS="$LIBS -lslang-2"
294
		AC_TRY_RUN([
294
		AC_TRY_RUN([
295
#include <slcurses.h>
295
#include <slcurses.h>
296
int main(void)
296
int main(void)
Lines 301-311 int main(void) Link Here
301
		    [AC_MSG_RESULT(yes)
301
		    [AC_MSG_RESULT(yes)
302
		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
302
		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
303
		    if test x$with_slang != xyes; then
303
		    if test x$with_slang != xyes; then
304
			CURSES_LIB="-L${with_slang}/lib -lslang"
304
			CURSES_LIB="-L${with_slang}/lib -lslang-2"
305
		    else
305
		    else
306
			CURSES_LIB="-lslang"
306
			CURSES_LIB="-lslang-2"
307
		    fi
307
		    fi
308
		    CURSES_LIB_NAME=slang],
308
		    CURSES_LIB_NAME=slang-2],
309
		    [AC_MSG_RESULT(no)
309
		    [AC_MSG_RESULT(no)
310
310
311
		    # We might need the term library
311
		    # We might need the term library
Lines 314-320 int main(void) Link Here
314
			test -n "$tcap" && break
314
			test -n "$tcap" && break
315
		    done
315
		    done
316
316
317
		    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
317
		    AC_MSG_CHECKING([for SLtt_initialize in -lslang-2 $tcap])
318
		    LIBS="$LIBS $tcap"
318
		    LIBS="$LIBS $tcap"
319
		    AC_TRY_RUN([
319
		    AC_TRY_RUN([
320
#include <slcurses.h>
320
#include <slcurses.h>
Lines 326-340 int main(void) Link Here
326
			[AC_MSG_RESULT(yes)
326
			[AC_MSG_RESULT(yes)
327
			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
327
			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
328
			if test x$with_slang != xyes; then
328
			if test x$with_slang != xyes; then
329
			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
329
			    CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap"
330
			else
330
			else
331
			    CURSES_LIB="-lslang $tcap"
331
			    CURSES_LIB="-lslang-2 $tcap"
332
			fi
332
			fi
333
			CURSES_LIB_NAME=slang],
333
			CURSES_LIB_NAME=slang-2],
334
			[AC_MSG_RESULT(no)
334
			[AC_MSG_RESULT(no)
335
335
336
			# We might need the math library
336
			# We might need the math library
337
			AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
337
			AC_MSG_CHECKING([for SLtt_initialize in -lslang-2 $tcap -lm])
338
			LIBS="$LIBS -lm"
338
			LIBS="$LIBS -lm"
339
			AC_TRY_RUN([
339
			AC_TRY_RUN([
340
#include <slcurses.h>
340
#include <slcurses.h>
Lines 346-356 int main(void) Link Here
346
			    [AC_MSG_RESULT(yes)
346
			    [AC_MSG_RESULT(yes)
347
			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
347
			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
348
			    if test x$with_slang != xyes; then
348
			    if test x$with_slang != xyes; then
349
				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
349
				CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap -lm"
350
			    else
350
			    else
351
				CURSES_LIB="-lslang $tcap -lm"
351
				CURSES_LIB="-lslang-2 $tcap -lm"
352
			    fi
352
			    fi
353
			    CURSES_LIB_NAME=slang],
353
			    CURSES_LIB_NAME=slang-2],
354
			    [AC_MSG_RESULT(no)],
354
			    [AC_MSG_RESULT(no)],
355
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
355
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
356
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
356
    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
Lines 372-378 int main(void) Link Here
372
	;;
372
	;;
373
    esac], [AC_MSG_RESULT(no)])
373
    esac], [AC_MSG_RESULT(no)])
374
374
375
if test x$CURSES_LIB_NAME = xslang; then
375
if test x$CURSES_LIB_NAME = xslang-2; then
376
    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
376
    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
377
    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
377
    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
378
    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
378
    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])

Return to bug 203672