Remove non-working checks for glib and libpurple (for now) and generate a new configure
This commit is contained in:
parent
92a57d18bb
commit
73f44ffe0b
2 changed files with 11 additions and 166 deletions
172
configure
vendored
172
configure
vendored
|
@ -577,8 +577,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='telegram-purple'
|
||||
PACKAGE_TARNAME='telegram-purple'
|
||||
PACKAGE_VERSION='0.1'
|
||||
PACKAGE_STRING='telegram-purple 0.1'
|
||||
PACKAGE_VERSION='0.2'
|
||||
PACKAGE_STRING='telegram-purple 0.2'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
@ -1223,7 +1223,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures telegram-purple 0.1 to adapt to many kinds of systems.
|
||||
\`configure' configures telegram-purple 0.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
@ -1284,7 +1284,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of telegram-purple 0.1:";;
|
||||
short | recursive ) echo "Configuration of telegram-purple 0.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
@ -1369,7 +1369,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
telegram-purple configure 0.1
|
||||
telegram-purple configure 0.2
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
@ -1788,7 +1788,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by telegram-purple $as_me 0.1, which was
|
||||
It was created by telegram-purple $as_me 0.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
@ -3181,163 +3181,9 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
|
||||
EXTRA_LIBS=""
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_save_prompt in -lreadline" >&5
|
||||
$as_echo_n "checking for rl_save_prompt in -lreadline... " >&6; }
|
||||
if ${ac_cv_lib_readline_rl_save_prompt+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lreadline $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char rl_save_prompt ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return rl_save_prompt ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_readline_rl_save_prompt=yes
|
||||
else
|
||||
ac_cv_lib_readline_rl_save_prompt=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_save_prompt" >&5
|
||||
$as_echo "$ac_cv_lib_readline_rl_save_prompt" >&6; }
|
||||
if test "x$ac_cv_lib_readline_rl_save_prompt" = xyes; then :
|
||||
|
||||
|
||||
$as_echo "#define READLINE_GNU 1" >>confdefs.h
|
||||
|
||||
EXTRA_LIBS="${EXTRA_LIBS} -lreadline" ;
|
||||
|
||||
else
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetnum" >&5
|
||||
$as_echo_n "checking for library containing tgetnum... " >&6; }
|
||||
if ${ac_cv_search_tgetnum+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_func_search_save_LIBS=$LIBS
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char tgetnum ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return tgetnum ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
for ac_lib in '' ncursesw ncurses curses; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
ac_res=-l$ac_lib
|
||||
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||
fi
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_search_tgetnum=$ac_res
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext
|
||||
if ${ac_cv_search_tgetnum+:} false; then :
|
||||
break
|
||||
fi
|
||||
done
|
||||
if ${ac_cv_search_tgetnum+:} false; then :
|
||||
|
||||
else
|
||||
ac_cv_search_tgetnum=no
|
||||
fi
|
||||
rm conftest.$ac_ext
|
||||
LIBS=$ac_func_search_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetnum" >&5
|
||||
$as_echo "$ac_cv_search_tgetnum" >&6; }
|
||||
ac_res=$ac_cv_search_tgetnum
|
||||
if test "$ac_res" != no; then :
|
||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_set_prompt in -ledit" >&5
|
||||
$as_echo_n "checking for rl_set_prompt in -ledit... " >&6; }
|
||||
if ${ac_cv_lib_edit_rl_set_prompt+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ledit $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char rl_set_prompt ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return rl_set_prompt ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_edit_rl_set_prompt=yes
|
||||
else
|
||||
ac_cv_lib_edit_rl_set_prompt=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_set_prompt" >&5
|
||||
$as_echo "$ac_cv_lib_edit_rl_set_prompt" >&6; }
|
||||
if test "x$ac_cv_lib_edit_rl_set_prompt" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBEDIT 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-ledit $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
$as_echo "#define READLINE_EDIT 1" >>confdefs.h
|
||||
|
||||
EXTRA_LIBS="${EXTRA_LIBS} -ledit" ;
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
#check for custom prog name
|
||||
|
||||
# Check whether --with-progname was given.
|
||||
|
@ -4557,7 +4403,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by telegram-purple $as_me 0.1, which was
|
||||
This file was extended by telegram-purple $as_me 0.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
@ -4610,7 +4456,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
telegram-purple config.status 0.1
|
||||
telegram-purple config.status 0.2
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
AC_PREREQ([2.68])
|
||||
AC_INIT([telegram-purple], [0.1])
|
||||
AC_INIT([telegram-purple], [0.2])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
|
@ -14,8 +14,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
|
|||
AC_SEARCH_LIBS([backtrace], [execinfo])
|
||||
AC_CHECK_LIB([z], [inflate])
|
||||
AC_CHECK_LIB([crypto], [AES_set_encrypt_key])
|
||||
AC_CHECK_LIB([glib], [g_main_loop_new])
|
||||
AC_CHECK_LIB([purple], [purple_notify_message])
|
||||
|
||||
EXTRA_LIBS=""
|
||||
|
||||
#check for custom prog name
|
||||
|
|
Loading…
Add table
Reference in a new issue