perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct gpm detection in configure script

This commit is contained in:
Markus Gans 2016-12-22 12:27:11 +01:00
parent c4a8886da2
commit f67537fba4
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2016-12-22 Markus Gans <guru.mail@muenster.de> 2016-12-22 Markus Gans <guru.mail@muenster.de>
* VTerm marks printed characters for a correct determination * VTerm marks printed characters for a correct determination
of unchanged characters of unchanged characters
* Correct gpm detection in configure script
2016-12-18 Markus Gans <guru.mail@muenster.de> 2016-12-18 Markus Gans <guru.mail@muenster.de>
* Only perform VTerm updates on terminal updates * Only perform VTerm updates on terminal updates

11
configure vendored
View File

@ -16973,13 +16973,12 @@ ac_config_files="$ac_config_files Makefile src/Makefile src/fonts/Makefile doc/M
# Check whether --with-gpm was given. # Check whether --with-gpm was given.
if test "${with_gpm+set}" = set; then : if test "${with_gpm+set}" = set; then :
withval=$with_gpm; withval=$with_gpm; with_gpm=no
else else
with_gpm=yes with_gpm=yes
fi fi
if test "x$with_gpm" = "xyes"
if test "x$with_gpm" != "xno"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgpm" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgpm" >&5
$as_echo_n "checking for main in -lgpm... " >&6; } $as_echo_n "checking for main in -lgpm... " >&6; }
@ -17012,12 +17011,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_main" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_main" >&5
$as_echo "$ac_cv_lib_gpm_main" >&6; } $as_echo "$ac_cv_lib_gpm_main" >&6; }
if test "x$ac_cv_lib_gpm_main" = xyes; then : if test "x$ac_cv_lib_gpm_main" = xyes; then :
LIBS="$LIBS -lgpm"
fi
$as_echo "#define HAVE_LIBGPM 1" >>confdefs.h $as_echo "#define HAVE_LIBGPM 1" >>confdefs.h
LIBS="$LIBS -lgpm"
fi
fi fi
# profiling # profiling

9
configure.ac
View File

@ -59,15 +59,14 @@ AC_CONFIG_FILES([Makefile src/Makefile src/fonts/Makefile doc/Makefile test/Make
# use GPM (General Purpose Mouse) # use GPM (General Purpose Mouse)
AC_ARG_WITH([gpm], AC_ARG_WITH([gpm],
[AS_HELP_STRING([--without-gpm], [Disable GPM mouse support])], [AS_HELP_STRING([--without-gpm], [Disable GPM mouse support])],
[], [with_gpm=no],
[with_gpm=yes]) [with_gpm=yes])
if test "x$with_gpm" = "xyes"
if test "x$with_gpm" != "xno"
then then
AC_CHECK_LIB([gpm], AC_CHECK_LIB([gpm],
[main], [main],
[LIBS="$LIBS -lgpm"]) [AC_DEFINE([HAVE_LIBGPM], 1, [Define to 1 if GPM mouse is enabled])
AC_DEFINE([HAVE_LIBGPM], 1, [Define to 1 if GPM mouse is enabled]) LIBS="$LIBS -lgpm"])
fi fi
# profiling # profiling