Added support for STLPort.
Changed entryadding in history
This commit is contained in:
sonofkojak
parent
c5a0ee8ec8
commit
3f6a14bca6
15
ChangeLog
15
ChangeLog
|
|
@ -0,0 +1,15 @@
|
|||
2002-06-05 EJ <sonofkojak@users.sourceforge.net>
|
||||
|
||||
* src/history.cc (append): Previously, an item was not placed in
|
||||
the history when it was the last item. Now, if we find an entry,
|
||||
we move it to the end of the list.
|
||||
|
||||
2002-06-05 EJ <sonofkojak@users.sourceforge.net>
|
||||
|
||||
* acinclude.m4: Added stlport detection code. When using an old
|
||||
version of g++/stdc++ you can get this code to compile only with
|
||||
the stlport. gcc-2.9[56] don't have a definition for
|
||||
char_traits.
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
#
|
||||
# $Id: acinclude.m4,v 1.1 2002/06/05 19:39:18 sonofkojak Exp $
|
||||
#
|
||||
|
||||
#
|
||||
# STLPort definitions
|
||||
#
|
||||
AC_DEFUN(AC_PATH_STLPORT_INC,
|
||||
[
|
||||
AC_REQUIRE_CPP()
|
||||
AC_MSG_CHECKING(for stlport headers)
|
||||
|
||||
ac_stlport_includes="no"
|
||||
ac_enable_stlport="yes"
|
||||
|
||||
AC_ARG_ENABLE(stlport,
|
||||
[ --enable-stlport do we need stlport ],
|
||||
[ ac_enable_stlport="$enableval" ])
|
||||
if test "$ac_enable_stlport" = "no"; then
|
||||
AC_SUBST(STLPORT_INCDIR)
|
||||
AC_SUBST(STLPORT_CXXFLAGS)
|
||||
have_stlport_inc="no"
|
||||
else
|
||||
|
||||
AC_ARG_WITH(stlport-includes,
|
||||
[ --with-stlport-includes where stlport headers are located],
|
||||
[ ac_stlport_includes="$withval"])
|
||||
|
||||
|
||||
AC_CACHE_VAL(ac_cv_header_stlport_includes, [
|
||||
|
||||
dnl did user give --with-stlport-includes?
|
||||
|
||||
if test "$ac_stlport_includes" = "no"; then
|
||||
|
||||
stlport_include_dirs="\
|
||||
$LIBCONFIGDIR/include/stlport \
|
||||
/usr/include/stlport \
|
||||
/usr/local/include/stlport \
|
||||
/usr/local/include/
|
||||
/usr/local/stlport/include"
|
||||
|
||||
for dir in $stlport_include_dirs; do
|
||||
if test -r "$dir/algorithm"; then
|
||||
ac_stlport_includes=$dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl caching
|
||||
ac_cv_header_stlport_includes=$ac_stlport_includes
|
||||
])
|
||||
|
||||
if test "$ac_cv_header_stlport_includes" = "no"; then
|
||||
have_stlport_inc="no"
|
||||
STLPORT_INCDIR=""
|
||||
STLPORT_CXXFLAGS=""
|
||||
else
|
||||
have_stlport_inc="yes"
|
||||
STLPORT_INCDIR="$ac_cv_header_stlport_includes"
|
||||
STLPORT_CXXFLAGS="-I$STLPORT_INCDIR"
|
||||
fi
|
||||
|
||||
|
||||
AC_SUBST(STLPORT_INCDIR)
|
||||
AC_SUBST(STLPORT_CXXFLAGS)
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$ac_cv_header_stlport_includes])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN(AC_PATH_STLPORT_LIB,
|
||||
[
|
||||
AC_REQUIRE_CPP()
|
||||
AC_MSG_CHECKING(for stlport libraries)
|
||||
|
||||
ac_stlport_lib="no"
|
||||
|
||||
ac_enable_stlport="yes"
|
||||
|
||||
AC_ARG_ENABLE(stlport,
|
||||
[ --enable-stlport do we need stlport ],
|
||||
[ ac_enable_stlport="$enableval" ])
|
||||
if test "$ac_enable_stlport" = "no"; then
|
||||
AC_SUBST(STLPORT_INCDIR)
|
||||
AC_SUBST(STLPORT_INCLUDES)
|
||||
have_stlport_inc="no"
|
||||
else
|
||||
|
||||
AC_ARG_WITH(stlport-lib,
|
||||
[ --with-stlport-lib where stlport library is located],
|
||||
[ ac_stlport_lib="$withval"])
|
||||
|
||||
|
||||
AC_CACHE_VAL(ac_cv_lib_stlport_lib, [
|
||||
|
||||
dnl did user give --with-stlport-lib?
|
||||
|
||||
if test "$ac_stlport_lib" = "no"; then
|
||||
|
||||
stlport_lib_dirs="\
|
||||
$STLPORTDIR/lib \
|
||||
/usr/lib \
|
||||
/usr/local/lib \
|
||||
/usr/local/tiit/lib"
|
||||
|
||||
for dir in $stlport_lib_dirs; do
|
||||
if test -r "$dir/libstlport_gcc.so"; then
|
||||
ac_stlport_lib=$dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl caching
|
||||
ac_cv_lib_stlport_lib=$ac_stlport_lib
|
||||
])
|
||||
|
||||
if test "$ac_cv_lib_stlport_lib" = "no"; then
|
||||
have_stlport_lib="no"
|
||||
STLPORT_LIBDIR=""
|
||||
STLPORT_LDFLAGS=""
|
||||
else
|
||||
have_stlport_lib="yes"
|
||||
STLPORT_LIBDIR="$ac_cv_lib_stlport_lib"
|
||||
STLPORT_LDFLAGS="-L$STLPORT_LIBDIR -lstlport_gcc -lpthread"
|
||||
fi
|
||||
|
||||
AC_SUBST(STLPORT_LIBDIR)
|
||||
AC_SUBST(STLPORT_LDFLAGS)
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$ac_cv_lib_stlport_lib])
|
||||
])
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
dnl aclocal.m4 generated automatically by aclocal 1.4
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||
|
||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -10,6 +10,144 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|||
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
dnl PARTICULAR PURPOSE.
|
||||
|
||||
#
|
||||
# $Id: aclocal.m4,v 1.2 2002/06/05 19:39:18 sonofkojak Exp $
|
||||
#
|
||||
|
||||
#
|
||||
# STLPort definitions
|
||||
#
|
||||
AC_DEFUN(AC_PATH_STLPORT_INC,
|
||||
[
|
||||
AC_REQUIRE_CPP()
|
||||
AC_MSG_CHECKING(for stlport headers)
|
||||
|
||||
ac_stlport_includes="no"
|
||||
ac_enable_stlport="yes"
|
||||
|
||||
AC_ARG_ENABLE(stlport,
|
||||
[ --enable-stlport do we need stlport ],
|
||||
[ ac_enable_stlport="$enableval" ])
|
||||
if test "$ac_enable_stlport" = "no"; then
|
||||
AC_SUBST(STLPORT_INCDIR)
|
||||
AC_SUBST(STLPORT_CXXFLAGS)
|
||||
have_stlport_inc="no"
|
||||
else
|
||||
|
||||
AC_ARG_WITH(stlport-includes,
|
||||
[ --with-stlport-includes where stlport headers are located],
|
||||
[ ac_stlport_includes="$withval"])
|
||||
|
||||
|
||||
AC_CACHE_VAL(ac_cv_header_stlport_includes, [
|
||||
|
||||
dnl did user give --with-stlport-includes?
|
||||
|
||||
if test "$ac_stlport_includes" = "no"; then
|
||||
|
||||
stlport_include_dirs="\
|
||||
$LIBCONFIGDIR/include/stlport \
|
||||
/usr/include/stlport \
|
||||
/usr/local/include/stlport \
|
||||
/usr/local/include/
|
||||
/usr/local/stlport/include"
|
||||
|
||||
for dir in $stlport_include_dirs; do
|
||||
if test -r "$dir/algorithm"; then
|
||||
ac_stlport_includes=$dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl caching
|
||||
ac_cv_header_stlport_includes=$ac_stlport_includes
|
||||
])
|
||||
|
||||
if test "$ac_cv_header_stlport_includes" = "no"; then
|
||||
have_stlport_inc="no"
|
||||
STLPORT_INCDIR=""
|
||||
STLPORT_CXXFLAGS=""
|
||||
else
|
||||
have_stlport_inc="yes"
|
||||
STLPORT_INCDIR="$ac_cv_header_stlport_includes"
|
||||
STLPORT_CXXFLAGS="-I$STLPORT_INCDIR"
|
||||
fi
|
||||
|
||||
|
||||
AC_SUBST(STLPORT_INCDIR)
|
||||
AC_SUBST(STLPORT_CXXFLAGS)
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$ac_cv_header_stlport_includes])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN(AC_PATH_STLPORT_LIB,
|
||||
[
|
||||
AC_REQUIRE_CPP()
|
||||
AC_MSG_CHECKING(for stlport libraries)
|
||||
|
||||
ac_stlport_lib="no"
|
||||
|
||||
ac_enable_stlport="yes"
|
||||
|
||||
AC_ARG_ENABLE(stlport,
|
||||
[ --enable-stlport do we need stlport ],
|
||||
[ ac_enable_stlport="$enableval" ])
|
||||
if test "$ac_enable_stlport" = "no"; then
|
||||
AC_SUBST(STLPORT_INCDIR)
|
||||
AC_SUBST(STLPORT_INCLUDES)
|
||||
have_stlport_inc="no"
|
||||
else
|
||||
|
||||
AC_ARG_WITH(stlport-lib,
|
||||
[ --with-stlport-lib where stlport library is located],
|
||||
[ ac_stlport_lib="$withval"])
|
||||
|
||||
|
||||
AC_CACHE_VAL(ac_cv_lib_stlport_lib, [
|
||||
|
||||
dnl did user give --with-stlport-lib?
|
||||
|
||||
if test "$ac_stlport_lib" = "no"; then
|
||||
|
||||
stlport_lib_dirs="\
|
||||
$STLPORTDIR/lib \
|
||||
/usr/lib \
|
||||
/usr/local/lib \
|
||||
/usr/local/tiit/lib"
|
||||
|
||||
for dir in $stlport_lib_dirs; do
|
||||
if test -r "$dir/libstlport_gcc.so"; then
|
||||
ac_stlport_lib=$dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl caching
|
||||
ac_cv_lib_stlport_lib=$ac_stlport_lib
|
||||
])
|
||||
|
||||
if test "$ac_cv_lib_stlport_lib" = "no"; then
|
||||
have_stlport_lib="no"
|
||||
STLPORT_LIBDIR=""
|
||||
STLPORT_LDFLAGS=""
|
||||
else
|
||||
have_stlport_lib="yes"
|
||||
STLPORT_LIBDIR="$ac_cv_lib_stlport_lib"
|
||||
STLPORT_LDFLAGS="-L$STLPORT_LIBDIR -lstlport_gcc -lpthread"
|
||||
fi
|
||||
|
||||
AC_SUBST(STLPORT_LIBDIR)
|
||||
AC_SUBST(STLPORT_LDFLAGS)
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$ac_cv_lib_stlport_lib])
|
||||
])
|
||||
|
||||
|
||||
# Do all the work for Automake. This macro actually does too much --
|
||||
# some checks are only needed if your package does certain things.
|
||||
# But this isn't really a big deal.
|
||||
|
|
@ -19,7 +157,7 @@ dnl PARTICULAR PURPOSE.
|
|||
dnl Usage:
|
||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||
|
||||
AC_DEFUN(AM_INIT_AUTOMAKE,
|
||||
AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||
PACKAGE=[$1]
|
||||
AC_SUBST(PACKAGE)
|
||||
|
|
@ -47,7 +185,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
|
|||
# Check to make sure that the build environment is sane.
|
||||
#
|
||||
|
||||
AC_DEFUN(AM_SANITY_CHECK,
|
||||
AC_DEFUN([AM_SANITY_CHECK],
|
||||
[AC_MSG_CHECKING([whether build environment is sane])
|
||||
# Just in case
|
||||
sleep 1
|
||||
|
|
@ -88,7 +226,7 @@ AC_MSG_RESULT(yes)])
|
|||
|
||||
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
||||
dnl The program must properly implement --version.
|
||||
AC_DEFUN(AM_MISSING_PROG,
|
||||
AC_DEFUN([AM_MISSING_PROG],
|
||||
[AC_MSG_CHECKING(for working $2)
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
|
|
@ -104,7 +242,7 @@ AC_SUBST($1)])
|
|||
|
||||
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||
|
||||
AC_DEFUN(AM_CONFIG_HEADER,
|
||||
AC_DEFUN([AM_CONFIG_HEADER],
|
||||
[AC_PREREQ([2.12])
|
||||
AC_CONFIG_HEADER([$1])
|
||||
dnl When config.status generates a header, we must update the stamp-h file.
|
||||
|
|
@ -125,6 +263,31 @@ for am_file in <<$1>>; do
|
|||
done<<>>dnl>>)
|
||||
changequote([,]))])
|
||||
|
||||
# isc-posix.m4 serial 1 (gettext-0.10.40)
|
||||
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
dnl Public License, this file may be distributed as part of a program
|
||||
dnl that contains a configuration script generated by Autoconf, under
|
||||
dnl the same distribution terms as the rest of that program.
|
||||
|
||||
# This test replaces the one in autoconf.
|
||||
# Currently this macro should have the same name as the autoconf macro
|
||||
# because gettext's gettext.m4 (distributed in the automake package)
|
||||
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
||||
# give these diagnostics:
|
||||
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
||||
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
||||
|
||||
undefine([AC_ISC_POSIX])
|
||||
|
||||
AC_DEFUN([AC_ISC_POSIX],
|
||||
[
|
||||
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
||||
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
# serial 1
|
||||
|
||||
|
|
@ -143,7 +306,7 @@ changequote([,]))])
|
|||
# program @code{ansi2knr}, which comes with Ghostscript.
|
||||
# @end defmac
|
||||
|
||||
AC_DEFUN(AM_PROG_CC_STDC,
|
||||
AC_DEFUN([AM_PROG_CC_STDC],
|
||||
[AC_REQUIRE([AC_PROG_CC])
|
||||
AC_BEFORE([$0], [AC_C_INLINE])
|
||||
AC_BEFORE([$0], [AC_C_CONST])
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
/* config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
||||
/* Define if you need to in order for stat and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@ ac_default_prefix=/usr/local
|
|||
# Any additions from configure.in:
|
||||
ac_help="$ac_help
|
||||
--enable-debug=[no/yes] Debugging information == no <--> optimization == yes"
|
||||
ac_help="$ac_help
|
||||
--enable-stlport do we need stlport "
|
||||
ac_help="$ac_help
|
||||
--with-stlport-lib where stlport library is located"
|
||||
ac_help="$ac_help
|
||||
--enable-stlport do we need stlport "
|
||||
ac_help="$ac_help
|
||||
--with-stlport-includes where stlport headers are located"
|
||||
ac_help="$ac_help
|
||||
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)"
|
||||
ac_help="$ac_help
|
||||
|
|
@ -560,7 +568,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:564: checking for a BSD compatible install" >&5
|
||||
echo "configure:572: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -613,7 +621,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
|
|||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
|
||||
echo "configure:617: checking whether build environment is sane" >&5
|
||||
echo "configure:625: checking whether build environment is sane" >&5
|
||||
# Just in case
|
||||
sleep 1
|
||||
echo timestamp > conftestfile
|
||||
|
|
@ -670,7 +678,7 @@ test "$program_suffix" != NONE &&
|
|||
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:674: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:682: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -716,7 +724,7 @@ EOF
|
|||
|
||||
missing_dir=`cd $ac_aux_dir && pwd`
|
||||
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
|
||||
echo "configure:720: checking for working aclocal" >&5
|
||||
echo "configure:728: checking for working aclocal" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -729,7 +737,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
|
||||
echo "configure:733: checking for working autoconf" >&5
|
||||
echo "configure:741: checking for working autoconf" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -742,7 +750,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working automake""... $ac_c" 1>&6
|
||||
echo "configure:746: checking for working automake" >&5
|
||||
echo "configure:754: checking for working automake" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -755,7 +763,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
|
||||
echo "configure:759: checking for working autoheader" >&5
|
||||
echo "configure:767: checking for working autoheader" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -768,7 +776,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
|
||||
echo "configure:772: checking for working makeinfo" >&5
|
||||
echo "configure:780: checking for working makeinfo" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
|
|
@ -799,10 +807,53 @@ if ! test "x$enable_debug" != "xyes"; then
|
|||
CXXFLAGS="-g3 -O0 -DDEBUG"
|
||||
fi
|
||||
|
||||
|
||||
echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
|
||||
echo "configure:813: checking for strerror in -lcposix" >&5
|
||||
ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcposix $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 821 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char strerror();
|
||||
|
||||
int main() {
|
||||
strerror()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
LIBS="$LIBS -lcposix"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:806: checking for $ac_word" >&5
|
||||
echo "configure:857: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -832,250 +883,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:836: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_prog_rejected=no
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
|
||||
ac_prog_rejected=yes
|
||||
continue
|
||||
fi
|
||||
ac_cv_prog_CC="cc"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
if test $ac_prog_rejected = yes; then
|
||||
# We found a bogon in the path, so make sure we never use it.
|
||||
set dummy $ac_cv_prog_CC
|
||||
shift
|
||||
if test $# -gt 0; then
|
||||
# We chose a different compiler from the bogus one.
|
||||
# However, it has the same basename, so the bogon will be chosen
|
||||
# first if we set CC to just the basename; use the full file name.
|
||||
shift
|
||||
set dummy "$ac_dir/$ac_word" "$@"
|
||||
shift
|
||||
ac_cv_prog_CC="$@"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
CC="$ac_cv_prog_CC"
|
||||
if test -n "$CC"; then
|
||||
echo "$ac_t""$CC" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test -z "$CC"; then
|
||||
case "`uname -s`" in
|
||||
*win32* | *WIN32*)
|
||||
# Extract the first word of "cl", so it can be a program name with args.
|
||||
set dummy cl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:887: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_CC="cl"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
CC="$ac_cv_prog_CC"
|
||||
if test -n "$CC"; then
|
||||
echo "$ac_t""$CC" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:919: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 930 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
ac_cv_prog_cc_cross=no
|
||||
else
|
||||
ac_cv_prog_cc_cross=yes
|
||||
fi
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
ac_cv_prog_cc_works=no
|
||||
fi
|
||||
rm -fr conftest*
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
|
||||
if test $ac_cv_prog_cc_works = no; then
|
||||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:961: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:966: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.c <<EOF
|
||||
#ifdef __GNUC__
|
||||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
|
||||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
GCC=yes
|
||||
else
|
||||
GCC=
|
||||
fi
|
||||
|
||||
ac_test_CFLAGS="${CFLAGS+set}"
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:994: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
echo 'void f(){}' > conftest.c
|
||||
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
|
||||
ac_cv_prog_cc_g=yes
|
||||
else
|
||||
ac_cv_prog_cc_g=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
|
||||
if test "$ac_test_CFLAGS" = set; then
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
elif test $ac_cv_prog_cc_g = yes; then
|
||||
if test "$GCC" = yes; then
|
||||
CFLAGS="-g -O2"
|
||||
else
|
||||
CFLAGS="-g"
|
||||
fi
|
||||
else
|
||||
if test "$GCC" = yes; then
|
||||
CFLAGS="-O2"
|
||||
else
|
||||
CFLAGS=
|
||||
fi
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
|
||||
echo "configure:1026: checking for POSIXized ISC" >&5
|
||||
if test -d /etc/conf/kconfig.d &&
|
||||
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
|
||||
then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ISC=yes # If later tests want to check for ISC.
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define _POSIX_SOURCE 1
|
||||
EOF
|
||||
|
||||
if test "$GCC" = yes; then
|
||||
CC="$CC -posix"
|
||||
else
|
||||
CC="$CC -Xp"
|
||||
fi
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
ISC=
|
||||
fi
|
||||
|
||||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1049: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_CC="gcc"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
CC="$ac_cv_prog_CC"
|
||||
if test -n "$CC"; then
|
||||
echo "$ac_t""$CC" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test -z "$CC"; then
|
||||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1079: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1126,7 +934,7 @@ fi
|
|||
# Extract the first word of "cl", so it can be a program name with args.
|
||||
set dummy cl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1130: checking for $ac_word" >&5
|
||||
echo "configure:938: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1158,7 +966,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:970: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1169,12 +977,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1173 "configure"
|
||||
#line 981 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1200,12 +1008,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1204: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1012: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:1209: checking whether we are using GNU C" >&5
|
||||
echo "configure:1017: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1214,7 +1022,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -1233,7 +1041,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1237: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1045: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1268,7 +1076,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
|
||||
echo "configure:1272: checking for ${CC-cc} option to accept ANSI C" >&5
|
||||
echo "configure:1080: checking for ${CC-cc} option to accept ANSI C" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1284,7 +1092,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
|
|||
do
|
||||
CC="$ac_save_CC $ac_arg"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1288 "configure"
|
||||
#line 1096 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -1321,7 +1129,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
am_cv_prog_cc_stdc="$ac_arg"; break
|
||||
else
|
||||
|
|
@ -1349,12 +1157,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
|
||||
echo "configure:1353: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:1161: checking for $ac_hdr that defines DIR" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1358 "configure"
|
||||
#line 1166 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -1362,7 +1170,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -1387,7 +1195,7 @@ done
|
|||
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
||||
if test $ac_header_dirent = dirent.h; then
|
||||
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
|
||||
echo "configure:1391: checking for opendir in -ldir" >&5
|
||||
echo "configure:1199: checking for opendir in -ldir" >&5
|
||||
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1395,7 +1203,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1399 "configure"
|
||||
#line 1207 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1406,7 +1214,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1428,7 +1236,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1432: checking for opendir in -lx" >&5
|
||||
echo "configure:1240: checking for opendir in -lx" >&5
|
||||
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1436,7 +1244,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1440 "configure"
|
||||
#line 1248 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1447,7 +1255,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1470,7 +1278,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1474: checking how to run the C preprocessor" >&5
|
||||
echo "configure:1282: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -1485,13 +1293,13 @@ else
|
|||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1489 "configure"
|
||||
#line 1297 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1502,13 +1310,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1506 "configure"
|
||||
#line 1314 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1519,13 +1327,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1523 "configure"
|
||||
#line 1331 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1550,12 +1358,12 @@ fi
|
|||
echo "$ac_t""$CPP" 1>&6
|
||||
|
||||
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
||||
echo "configure:1554: checking for ANSI C header files" >&5
|
||||
echo "configure:1362: checking for ANSI C header files" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1559 "configure"
|
||||
#line 1367 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -1563,7 +1371,7 @@ else
|
|||
#include <float.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1580,7 +1388,7 @@ rm -f conftest*
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1584 "configure"
|
||||
#line 1392 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <string.h>
|
||||
EOF
|
||||
|
|
@ -1598,7 +1406,7 @@ fi
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1602 "configure"
|
||||
#line 1410 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
EOF
|
||||
|
|
@ -1619,7 +1427,7 @@ if test "$cross_compiling" = yes; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1623 "configure"
|
||||
#line 1431 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <ctype.h>
|
||||
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||||
|
|
@ -1630,7 +1438,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
|
|||
exit (0); }
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:1634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -1658,7 +1466,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1662: checking for $ac_word" >&5
|
||||
echo "configure:1470: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1690,7 +1498,7 @@ test -n "$CXX" || CXX="gcc"
|
|||
|
||||
|
||||
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1694: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1502: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=C
|
||||
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1701,12 +1509,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1705 "configure"
|
||||
#line 1513 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cxx_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1732,12 +1540,12 @@ if test $ac_cv_prog_cxx_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1736: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1544: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
|
||||
echo "configure:1741: checking whether we are using GNU C++" >&5
|
||||
echo "configure:1549: checking whether we are using GNU C++" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1746,7 +1554,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gxx=yes
|
||||
else
|
||||
ac_cv_prog_gxx=no
|
||||
|
|
@ -1765,7 +1573,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|||
ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS=
|
||||
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1769: checking whether ${CXX-g++} accepts -g" >&5
|
||||
echo "configure:1577: checking whether ${CXX-g++} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1796,7 +1604,203 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
for ac_declaration in \
|
||||
''\
|
||||
'#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
'extern "C" void exit (int);' \
|
||||
'void exit (int);'
|
||||
do
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1618 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
$ac_declaration
|
||||
int main() {
|
||||
exit (42);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
continue
|
||||
fi
|
||||
rm -f conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1636 "configure"
|
||||
#include "confdefs.h"
|
||||
$ac_declaration
|
||||
int main() {
|
||||
exit (42);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
break
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -f conftest*
|
||||
done
|
||||
if test -n "$ac_declaration"; then
|
||||
echo '#ifdef __cplusplus' >>confdefs.h
|
||||
echo $ac_declaration >>confdefs.h
|
||||
echo '#endif' >>confdefs.h
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking for stlport libraries""... $ac_c" 1>&6
|
||||
echo "configure:1662: checking for stlport libraries" >&5
|
||||
|
||||
ac_stlport_lib="no"
|
||||
|
||||
ac_enable_stlport="yes"
|
||||
|
||||
# Check whether --enable-stlport or --disable-stlport was given.
|
||||
if test "${enable_stlport+set}" = set; then
|
||||
enableval="$enable_stlport"
|
||||
ac_enable_stlport="$enableval"
|
||||
fi
|
||||
|
||||
if test "$ac_enable_stlport" = "no"; then
|
||||
|
||||
|
||||
have_stlport_inc="no"
|
||||
else
|
||||
|
||||
# Check whether --with-stlport-lib or --without-stlport-lib was given.
|
||||
if test "${with_stlport_lib+set}" = set; then
|
||||
withval="$with_stlport_lib"
|
||||
ac_stlport_lib="$withval"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_stlport_lib'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
|
||||
|
||||
if test "$ac_stlport_lib" = "no"; then
|
||||
|
||||
stlport_lib_dirs="\
|
||||
$STLPORTDIR/lib \
|
||||
/usr/lib \
|
||||
/usr/local/lib \
|
||||
/usr/local/tiit/lib"
|
||||
|
||||
for dir in $stlport_lib_dirs; do
|
||||
if test -r "$dir/libstlport_gcc.so"; then
|
||||
ac_stlport_lib=$dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
ac_cv_lib_stlport_lib=$ac_stlport_lib
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "$ac_cv_lib_stlport_lib" = "no"; then
|
||||
have_stlport_lib="no"
|
||||
STLPORT_LIBDIR=""
|
||||
STLPORT_LDFLAGS=""
|
||||
else
|
||||
have_stlport_lib="yes"
|
||||
STLPORT_LIBDIR="$ac_cv_lib_stlport_lib"
|
||||
STLPORT_LDFLAGS="-L$STLPORT_LIBDIR -lstlport_gcc -lpthread"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_lib_stlport_lib" 1>&6
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking for stlport headers""... $ac_c" 1>&6
|
||||
echo "configure:1734: checking for stlport headers" >&5
|
||||
|
||||
ac_stlport_includes="no"
|
||||
ac_enable_stlport="yes"
|
||||
|
||||
# Check whether --enable-stlport or --disable-stlport was given.
|
||||
if test "${enable_stlport+set}" = set; then
|
||||
enableval="$enable_stlport"
|
||||
ac_enable_stlport="$enableval"
|
||||
fi
|
||||
|
||||
if test "$ac_enable_stlport" = "no"; then
|
||||
|
||||
|
||||
have_stlport_inc="no"
|
||||
else
|
||||
|
||||
# Check whether --with-stlport-includes or --without-stlport-includes was given.
|
||||
if test "${with_stlport_includes+set}" = set; then
|
||||
withval="$with_stlport_includes"
|
||||
ac_stlport_includes="$withval"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stlport_includes'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
|
||||
|
||||
if test "$ac_stlport_includes" = "no"; then
|
||||
|
||||
stlport_include_dirs="\
|
||||
$LIBCONFIGDIR/include/stlport \
|
||||
/usr/include/stlport \
|
||||
/usr/local/include/stlport \
|
||||
/usr/local/include/
|
||||
/usr/local/stlport/include"
|
||||
|
||||
for dir in $stlport_include_dirs; do
|
||||
if test -r "$dir/algorithm"; then
|
||||
ac_stlport_includes=$dir
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
ac_cv_header_stlport_includes=$ac_stlport_includes
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "$ac_cv_header_stlport_includes" = "no"; then
|
||||
have_stlport_inc="no"
|
||||
STLPORT_INCDIR=""
|
||||
STLPORT_CXXFLAGS=""
|
||||
else
|
||||
have_stlport_inc="yes"
|
||||
STLPORT_INCDIR="$ac_cv_header_stlport_includes"
|
||||
STLPORT_CXXFLAGS="-I$STLPORT_INCDIR"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_header_stlport_includes" 1>&6
|
||||
|
||||
|
||||
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
|
||||
if test "${with_gtk_prefix+set}" = set; then
|
||||
withval="$with_gtk_prefix"
|
||||
|
|
@ -1847,7 +1851,7 @@ fi
|
|||
# Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
set dummy gtk-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1851: checking for $ac_word" >&5
|
||||
echo "configure:1855: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1882,7 +1886,7 @@ fi
|
|||
|
||||
min_gtk_version=1.2.6
|
||||
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
||||
echo "configure:1886: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo "configure:1890: checking for GTK - version >= $min_gtk_version" >&5
|
||||
no_gtk=""
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
no_gtk=yes
|
||||
|
|
@ -1905,7 +1909,7 @@ echo "configure:1886: checking for GTK - version >= $min_gtk_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1909 "configure"
|
||||
#line 1913 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
@ -1983,7 +1987,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -2017,7 +2021,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2021 "configure"
|
||||
#line 2025 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
@ -2027,7 +2031,7 @@ int main() {
|
|||
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
||||
|
|
@ -2258,6 +2262,11 @@ s%@SET_MAKE@%$SET_MAKE%g
|
|||
s%@CC@%$CC%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@CXX@%$CXX%g
|
||||
s%@STLPORT_INCDIR@%$STLPORT_INCDIR%g
|
||||
s%@STLPORT_INCLUDES@%$STLPORT_INCLUDES%g
|
||||
s%@STLPORT_LIBDIR@%$STLPORT_LIBDIR%g
|
||||
s%@STLPORT_LDFLAGS@%$STLPORT_LDFLAGS%g
|
||||
s%@STLPORT_CXXFLAGS@%$STLPORT_CXXFLAGS%g
|
||||
s%@GTK_CONFIG@%$GTK_CONFIG%g
|
||||
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
|
||||
s%@GTK_LIBS@%$GTK_LIBS%g
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ AM_PROG_CC_STDC
|
|||
AC_HEADER_DIRENT
|
||||
AC_HEADER_STDC
|
||||
AC_PROG_CXX
|
||||
|
||||
AC_PATH_STLPORT_LIB
|
||||
AC_PATH_STLPORT_INC
|
||||
|
||||
AM_PATH_GTK(1.2.6, ,
|
||||
AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
INCLUDES = \
|
||||
@GTK_CFLAGS@
|
||||
@GTK_CFLAGS@ @STLPORT_CXXFLAGS@
|
||||
|
||||
bin_PROGRAMS = gmrun
|
||||
|
||||
|
|
@ -13,5 +13,5 @@ gmrun_SOURCES = \
|
|||
|
||||
# gmrun_LDFLAGS = -s
|
||||
|
||||
gmrun_LDADD = @GTK_LIBS@
|
||||
gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*****************************************************************************
|
||||
* $Id: gtkcompletionline.cc,v 1.26 2001/11/02 16:33:21 mishoo Exp $
|
||||
* $Id: gtkcompletionline.cc,v 1.27 2002/06/05 19:39:18 sonofkojak Exp $
|
||||
* Copyright (C) 2000, Mishoo
|
||||
* Author: Mihai Bazon Email: mishoo@fenrir.infoiasi.ro
|
||||
*
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
*****************************************************************************/
|
||||
|
||||
|
||||
#include "gtkcompletionline.h"
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
#include <gtk/gtkclist.h>
|
||||
|
|
@ -26,12 +25,15 @@
|
|||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <set>
|
||||
#include <strstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include "gtkcompletionline.h"
|
||||
|
||||
static int on_row_selected_handler = 0;
|
||||
static int on_key_press_handler = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*****************************************************************************
|
||||
* $Id: history.cc,v 1.7 2001/07/31 10:56:44 mishoo Exp $
|
||||
* $Id: history.cc,v 1.8 2002/06/05 19:39:18 sonofkojak Exp $
|
||||
* Copyright (C) 2000, Mishoo
|
||||
* Author: Mihai Bazon Email: mishoo@fenrir.infoiasi.ro
|
||||
*
|
||||
|
|
@ -10,16 +10,17 @@
|
|||
*****************************************************************************/
|
||||
|
||||
|
||||
#include <glib.h>
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <algorithm>
|
||||
using namespace std;
|
||||
|
||||
#include "history.h"
|
||||
#include "prefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <fstream>
|
||||
using namespace std;
|
||||
|
||||
HistoryFile::HistoryFile()
|
||||
{
|
||||
m_file_entries = 0;
|
||||
|
|
@ -82,13 +83,19 @@ HistoryFile::sync_the_file()
|
|||
void
|
||||
HistoryFile::append(const char *entry)
|
||||
{
|
||||
std::string ent = std::string(entry);
|
||||
if (!history.empty()) {
|
||||
StrArray::iterator i = history.end();
|
||||
i--;
|
||||
if (*i != entry) history.push_back(entry);
|
||||
} else {
|
||||
history.push_back(entry);
|
||||
StrArray::reverse_iterator i;
|
||||
#ifdef DEBUG
|
||||
for_each(history.begin(), history.end(), DumpString(cerr));
|
||||
#endif
|
||||
i = find(history.rbegin(), history.rend(), ent);
|
||||
if (i != history.rend()) {
|
||||
cerr << "erasing "<< ent << endl;
|
||||
history.erase(remove(history.begin(), history.end(), ent));
|
||||
}
|
||||
}
|
||||
history.push_back(ent);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*****************************************************************************
|
||||
* $Id: history.h,v 1.8 2001/10/19 09:19:35 mishoo Exp $
|
||||
* $Id: history.h,v 1.9 2002/06/05 19:39:18 sonofkojak Exp $
|
||||
* Copyright (C) 2000, Mishoo
|
||||
* Author: Mihai Bazon Email: mishoo@fenrir.infoiasi.ro
|
||||
*
|
||||
|
|
@ -59,6 +59,13 @@ class HistoryFile
|
|||
|
||||
protected:
|
||||
void read_the_file();
|
||||
private:
|
||||
struct DumpString {
|
||||
DumpString(std::ostream& o) : _out(o) {}
|
||||
void operator()(std::string& str) { _out << str << endl; }
|
||||
private:
|
||||
std::ostream& _out;
|
||||
};
|
||||
};
|
||||
|
||||
#endif // __HISTORY_H__
|
||||
|
|
|
|||
10
src/main.cc
10
src/main.cc
|
|
@ -1,5 +1,5 @@
|
|||
/*****************************************************************************
|
||||
* $Id: main.cc,v 1.21 2001/11/02 15:49:11 mishoo Exp $
|
||||
* $Id: main.cc,v 1.22 2002/06/05 19:39:18 sonofkojak Exp $
|
||||
* Copyright (C) 2000, Mishoo
|
||||
* Author: Mihai Bazon Email: mishoo@fenrir.infoiasi.ro
|
||||
*
|
||||
|
|
@ -10,10 +10,6 @@
|
|||
*****************************************************************************/
|
||||
|
||||
|
||||
#include "gtkcompletionline.h"
|
||||
|
||||
#include "prefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
|
||||
|
|
@ -27,6 +23,10 @@ using namespace std;
|
|||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "gtkcompletionline.h"
|
||||
#include "prefs.h"
|
||||
|
||||
|
||||
struct gigi
|
||||
{
|
||||
GtkWidget *w1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue