Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix to incorporate C++ build changes into configure.ac and Makefile.in

Browse source
This commit is contained in:
ridiculousfish 2012-01-06 10:23:38 -08:00
parent 2516fd90eb
commit 820acb981b
3 changed files with 40 additions and 1104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1030
Makefile.cpp
View file

File diff suppressed because it is too large Load diff

57
Makefile.in
View file

@ -38,7 +38,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
# Programs # Programs
# #
CC := @CC@ CC := @CPP@
INSTALL:=@INSTALL@ INSTALL:=@INSTALL@
@ -63,8 +63,7 @@ optbindirs = @optbindirs@
# #
MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
CFLAGS = @CFLAGS@ $(MACROS) $(EXTRA_CFLAGS) CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LIBS@ @LDFLAGS@ LDFLAGS = @LIBS@ @LDFLAGS@
LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@ LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@ LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@
@ -81,11 +80,11 @@ HAVE_GETTEXT=@HAVE_GETTEXT@
# #
#Additional .c files used by common.o. These also have a corresponding #Additional .cpp files used by common.o. These also have a corresponding
#.h file. #.h file.
# #
COMMON_FILES := util.c halloc.c halloc_util.c fallback.c COMMON_FILES := util.cpp halloc.cpp halloc_util.cpp fallback.cpp
# #
@ -97,7 +96,7 @@ FISH_OBJS := function.o builtin.o complete.o env.o exec.o expand.o \
tokenizer.o wildcard.o wgetopt.o wutil.o input.o output.o intern.o \ tokenizer.o wildcard.o wgetopt.o wutil.o input.o output.o intern.o \
env_universal.o env_universal_common.o input_common.o event.o \ env_universal.o env_universal_common.o input_common.o event.o \
signal.o io.o parse_util.o common.o screen.o path.o \ signal.o io.o parse_util.o common.o screen.o path.o \
parser_keywords.o parser_keywords.o iothread.o builtin_scripts.o
FISH_INDENT_OBJS := fish_indent.o print_help.o common.o \ FISH_INDENT_OBJS := fish_indent.o print_help.o common.o \
parser_keywords.o wutil.o tokenizer.o parser_keywords.o wutil.o tokenizer.o
@ -106,8 +105,8 @@ parser_keywords.o wutil.o tokenizer.o
# Additional files used by builtin.o # Additional files used by builtin.o
# #
BUILTIN_FILES := builtin_set.c builtin_commandline.c \ BUILTIN_FILES := builtin_set.cpp builtin_commandline.cpp \
builtin_ulimit.c builtin_complete.c builtin_jobs.c builtin_ulimit.cpp builtin_complete.cpp builtin_jobs.cpp
# #
@ -116,7 +115,7 @@ BUILTIN_FILES := builtin_set.c builtin_commandline.c \
FISH_PAGER_OBJS := fish_pager.o output.o wutil.o \ FISH_PAGER_OBJS := fish_pager.o output.o wutil.o \
input_common.o env_universal.o env_universal_common.o common.o \ input_common.o env_universal.o env_universal_common.o common.o \
print_help.o print_help.o iothread.o
# #
@ -160,6 +159,18 @@ HDR_FILES_SRC := doc_src/index.hdr.in doc_src/commands.hdr.in doc_src/design.hdr
HDR_FILES := $(subst .hdr.in,.hdr,$(HDR_FILES_SRC)) HDR_FILES := $(subst .hdr.in,.hdr,$(HDR_FILES_SRC))
#
# Internalized scripts
#
GENERATED_INTERN_SCRIPT_FILES := builtin_scripts.h builtin_scripts.cpp
# Use a pattern rule so that Make knows to only issue one invocation
# per http://www.gnu.org/software/make/manual/make.html#Pattern-Intro
builtin%scripts.h builtin%scripts.cpp: internalize_scripts.py
./internalize_scripts.py share/functions/*.fish
# #
# Files containing documentation for external commands. # Files containing documentation for external commands.
# #
@ -191,12 +202,12 @@ DOC_SRC_DIR_FILES := $(HDR_FILES_SRC) $(HELP_SRC)
MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help.in \ MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help.in \
Makefile.in configure configure.ac config.h.in install-sh \ Makefile.in configure configure.ac config.h.in install-sh \
set_color.c key_reader.c $(MIME_OBJS:.o=.h) \ set_color.cpp key_reader.cpp $(MIME_OBJS:.o=.h) \
$(MIME_OBJS:.o=.c) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) \ $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) \
$(COMMON_FILES) $(COMMON_FILES:.c=.h) $(FISH_OBJS:.o=.c) \ $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp) \
fish.spec.in INSTALL README user_doc.head.html xsel-0.9.6.tar \ fish.spec.in INSTALL README user_doc.head.html xsel-0.9.6.tar \
ChangeLog config.sub config.guess fish_tests.c fish.c fish_pager.c \ ChangeLog config.sub config.guess fish_tests.cpp fish.cpp fish_pager.cpp \
fishd.c seq.in make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.c) fishd.cpp seq.in make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.cpp)
# #
# The sorting is not meaningful in itself, but it has the side effect # The sorting is not meaningful in itself, but it has the side effect
@ -302,11 +313,11 @@ Makefile: Makefile.in configure
# #
debug: debug:
$(MAKE) all EXTRA_CFLAGS="-O0 -Wno-unused -Werror -g" $(MAKE) all EXTRA_CXXFLAGS="-O0 -Wno-unused -Werror -g"
.PHONY: debug .PHONY: debug
prof: prof:
$(MAKE) all EXTRA_CFLAGS="-pg" LDFLAGS="-pg" $(MAKE) all EXTRA_CXXFLAGS="-pg" LDFLAGS="-pg"
.PHONY: prof .PHONY: prof
# #
@ -326,7 +337,7 @@ user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC)
# Source code documentation. Also includes user documentation. # Source code documentation. Also includes user documentation.
# #
doc: *.h *.c doc.h Doxyfile doc: *.h *.cpp doc.h Doxyfile
doxygen; doxygen;
@ -453,9 +464,9 @@ doc.h: $(HDR_FILES)
# Create a template translation object # Create a template translation object
# #
messages.pot: *.c *.h etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq messages.pot: *.cpp *.h etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq
if test $(HAVE_GETTEXT) = 1;then \ if test $(HAVE_GETTEXT) = 1;then \
xgettext -k_ -kN_ *.c *.h -o messages.pot; \ xgettext -k_ -kN_ *.cpp *.h -o messages.pot; \
if xgettext -j -k_ -kN_ -k--description -LShell etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \ if xgettext -j -k_ -kN_ -k--description -LShell etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
echo "Your xgettext version is too old to build the messages.pot file"\ echo "Your xgettext version is too old to build the messages.pot file"\
rm messages.pot\ rm messages.pot\
@ -742,8 +753,8 @@ set_color: set_color.o print_help.o common.o
# Test program for the tokenizer library # Test program for the tokenizer library
# #
tokenizer_test: tokenizer.c tokenizer.h wutil.o common.o tokenizer_test: tokenizer.cpp tokenizer.h wutil.o common.o
$(CC) $(CFLAGS) tokenizer.c wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@ $(CC) $(CXXFLAGS) tokenizer.cpp wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
# #
@ -766,7 +777,7 @@ key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_c
# Update dependencies # Update dependencies
# #
depend: depend:
makedepend -fMakefile.in -Y *.c makedepend -fMakefile.in -Y *.cpp
./config.status ./config.status
.PHONY: depend .PHONY: depend
@ -877,7 +888,7 @@ distclean: clean
# #
clean: clean:
rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.c doc_src/*.o doc_src/commands.hdr rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr
rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader
rm -f share/config.fish etc/config.fish doc_src/index.hdr doc_src/commands.hdr rm -f share/config.fish etc/config.fish doc_src/index.hdr doc_src/commands.hdr

57
configure.ac
View file

@ -110,7 +110,7 @@ for i in /usr/pkg /sw /opt /opt/local; do
AC_MSG_CHECKING([for $i/include include directory]) AC_MSG_CHECKING([for $i/include include directory])
if test -d $i/include; then if test -d $i/include; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
CPPFLAGS="$CPPFLAGS -I$i/include/" CXXFLAGS="$CXXFLAGS -I$i/include/"
CFLAGS="$CFLAGS -I$i/include/" CFLAGS="$CFLAGS -I$i/include/"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -159,10 +159,7 @@ AH_BOTTOM([#if __GNUC__ >= 3
# Set up various programs needed for install # Set up various programs needed for install
# #
# Here we look for c99 before cc as Sun Studio compiler supports c99 AC_PROG_CC([g++ cpp])
# through the c99 binary.
AC_PROG_CC([gcc c99 cc])
AC_PROG_CPP AC_PROG_CPP
AC_PROG_INSTALL AC_PROG_INSTALL
@ -239,55 +236,13 @@ if test x$local_gettext != xno; then
fi fi
#
# Test if the compiler accepts the -std=c99 flag. If so, using it
# increases the odds of correct compilation, since we want to use the
# *wprintf functions, which where defined in C99.
#
# NOTE: Never versions of autoconf has AC_CHECK_PROG_CC_C99
#
if test "$CC" != "c99"; then
XCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -std=c99"
XCPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -std=c99"
AC_MSG_CHECKING(if -std=c99 works)
AC_CACHE_VAL(
local_cv_has__std_c99,
[
AC_TRY_RUN(
[
#include <stdlib.h>
#include <stdio.h>
int main()
{
return 0;
}
],
local_cv_has__std_c99=yes,
local_cv_has__std_c99=no,
)
]
)
AC_MSG_RESULT($local_cv_has__std_c99)
case x$local_cv_has__std_c99 in
xno)
CFLAGS="$XCFLAGS"
CPPFLAGS="$XCPPFLAGS" ;;
esac
fi
# #
# Try to enable large file support. This will make sure that on systems # Try to enable large file support. This will make sure that on systems
# where off_t can be either 32 or 64 bit, the latter size is used. On # where off_t can be either 32 or 64 bit, the latter size is used. On
# other systems, this should do nothing. (Hopefully) # other systems, this should do nothing. (Hopefully)
# #
CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" CXXFLAGS="$CXXFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
# #
# If we are using gcc, set some flags that increase the odds of the # If we are using gcc, set some flags that increase the odds of the
@ -306,14 +261,14 @@ if test "$GCC" = yes; then
# bug has been verified to not exist on Linux using GCC 3.3.3. # bug has been verified to not exist on Linux using GCC 3.3.3.
# #
CFLAGS="$CFLAGS -fno-optimize-sibling-calls" CXXFLAGS="$CXXFLAGS -fno-optimize-sibling-calls"
# #
# -Wall is there to keep me on my toes # -Wall is there to keep me on my toes
# #
CFLAGS="$CFLAGS -Wall" CXXFLAGS="$CXXFLAGS -Wall"
# #
# This is needed in order to get the really cool backtraces # This is needed in order to get the really cool backtraces
@ -645,7 +600,7 @@ AC_CHECK_HEADER(
# conditional definition of __EXTENSIONS__, to avoid redundant tests. # conditional definition of __EXTENSIONS__, to avoid redundant tests.
# #
XCFLAGS="$CFLAGS" XCFLAGS="$CXXFLAGS"
echo Checking how to use -D_XOPEN_SOURCE=600 and -D_POSIX_C_SOURCE=200112L... echo Checking how to use -D_XOPEN_SOURCE=600 and -D_POSIX_C_SOURCE=200112L...
local_found_posix_switch=no local_found_posix_switch=no