Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: check for readline properly

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-11-11 15:33:32 +01:00
parent 257f67c732
commit 320db64bb9
6 changed files with 159 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@@ -63,6 +63,7 @@ noinst_HEADERS = \
utility/functional.h \
utility/html.h \
utility/option_parser.h \
utility/readline.h \
utility/string.h \
utility/type_conversions.h \
utility/wide_string.h \

2
src/actions.cpp
View File

@@ -28,7 +28,6 @@
#include <boost/lexical_cast.hpp>
#include <algorithm>
#include <iostream>
#include <readline/readline.h>
#include "actions.h"
#include "charset.h"
@@ -57,6 +56,7 @@
#include "server_info.h"
#include "song_info.h"
#include "outputs.h"
#include "utility/readline.h"
#include "utility/string.h"
#include "utility/type_conversions.h"
#include "tag_editor.h"

38
src/utility/readline.h Normal file
View File

@@ -0,0 +1,38 @@
/***************************************************************************
* Copyright (C) 2008-2014 by Andrzej Rybczak *
* electricityispower@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef NCMPCPP_UTILITY_READLINE_H
#define NCMPCPP_UTILITY_READLINE_H
#include "config.h"
#if defined(HAVE_READLINE_HISTORY_H)
# include <readline/history.h>
#endif // HAVE_READLINE_HISTORY
#if defined(HAVE_READLINE_H)
# include <readline.h>
#elif defined(HAVE_READLINE_READLINE_H)
# include <readline/readline.h>
#else
# error "readline is not available"
#endif
#endif // NCMPCPP_READLINE_UTILITY_H

6
src/window.cpp
View File

@@ -23,12 +23,10 @@
#include <cstdio>
#include <cstdlib>
#include <iostream>
#include <readline/history.h>
#include <readline/readline.h>
#include <sys/select.h>
#include <unistd.h>
#include "utility/readline.h"
#include "utility/string.h"
#include "utility/wide_string.h"
#include "window.h"
@@ -1111,8 +1109,10 @@ std::string Window::prompt(const std::string &base, size_t width, bool encrypted
curs_set(0);
if (input != nullptr)
{
#ifdef HAVE_READLINE_HISTORY_H
if (!encrypted && input[0] != 0)
add_history(input);
#endif // HAVE_READLINE_HISTORY_H
result = input;
free(input);
}