PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Fix configure script a bit.

This commit is contained in:
Dave Davenport 2016-08-29 21:38:29 +02:00
parent 5cfe9a89b3
commit e79361e890
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -54,9 +54,11 @@ AC_ARG_ENABLE(asan,
[AM_CFLAGS="${AM_CFLAGS} -fsanitize=address -fno-omit-frame-pointer -g3"])
AC_ARG_ENABLE(broken-drun,
[ --enable-broken-drun drun],
[AM_CFLAGS="${AM_CFLAGS} -DBROKEN_DRUN"])
dnl --------------------------------------------------------------------
dnl DRun dialog
dnl --------------------------------------------------------------------
AC_ARG_ENABLE([drun], AC_HELP_STRING([--enable-drun],[Enable desktop file run dialog]))
AS_IF([test "x${enable_drun}" == "xyes"], [AC_DEFINE([ENABLE_DRUN], [1], [Enable desktop file run dialog])])
dnl ---------------------------------------------------------------------
dnl Disable window mode
dnl ---------------------------------------------------------------------
@ -117,6 +119,16 @@ echo "Timing output: Enabled"
else
echo "Timing output: Disabled"
fi
if test x$enable_drun = xyes; then
echo "Desktop File run dialog Enabled"
else
echo "Desktop File run dialog Disabled"
fi
if test x$enable_windowmode != xno; then
echo "Window Switcher dialog Enabled"
else
echo "Window Switcher dialog Disabled"
fi
echo "-------------------------------------"
echo "Now type 'make' to build"
echo ""

3
include/dialogs/drun.h
View File

@ -6,6 +6,9 @@
* @ingroup MODES
* @{
*/
#include <config.h>
#ifdef ENABLE_DRUN
extern Mode drun_mode;
#endif // ENABLE_DRUN
/*@}*/
#endif // ROFI_DIALOG_DRUN_H

2
source/dialogs/combi.c
View File

@ -80,9 +80,11 @@ static void combi_mode_parse_switchers ( Mode *sw )
else if ( strcasecmp ( token, "run" ) == 0 ) {
pd->switchers[pd->num_switchers++] = &run_mode;
}
#ifdef ENABLE_DRUN
else if ( strcasecmp ( token, "drun" ) == 0 ) {
pd->switchers[pd->num_switchers++] = &drun_mode;
}
#endif // ENABLE_DRUN
else {
// If not build in, use custom switchers.
Mode *sw = script_switcher_parse_setup ( token );

3
source/dialogs/drun.c
View File

@ -25,6 +25,7 @@
*
*/
#include <config.h>
#ifdef ENABLE_DRUN
#include <stdlib.h>
#include <stdio.h>
@ -576,3 +577,5 @@ Mode drun_mode =
.private_data = NULL,
.free = NULL
};
#endif // ENABLE_DRUN

4
source/rofi.c
View File

@ -368,7 +368,7 @@ static int add_mode ( const char * token )
modi[num_modi] = &run_mode;
num_modi++;
}
#ifdef BROKEN_DRUN
#ifdef ENABLE_DRUN
else if ( strcasecmp ( token, "drun" ) == 0 ) {
modi[num_modi] = &drun_mode;
num_modi++;
@ -410,7 +410,9 @@ static void setup_modi ( void )
// and re-alloc moves that pointer.
mode_set_config ( &ssh_mode );
mode_set_config ( &run_mode );
#ifdef ENABLE_DRUN
mode_set_config ( &drun_mode );
#endif
#ifdef WINDOW_MODE
mode_set_config ( &window_mode );