From 516b334bd963452578367b2cd354db6c39ba99c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Fri, 14 Aug 2009 11:05:49 +0200 Subject: Remove autoconf/make files. diff --git a/3rdParty/Boost/Makefile.inc b/3rdParty/Boost/Makefile.inc deleted file mode 100644 index d28bbcb..0000000 --- a/3rdParty/Boost/Makefile.inc +++ /dev/null @@ -1,59 +0,0 @@ -CPPFLAGS += -DBOOST_ALL_NO_LIB -CXXFLAGS += -isystem 3rdParty/Boost -DBOOST_SIGNALS_NAMESPACE=bsignals - -BOOST_SOURCES += \ - 3rdParty/Boost/libs/date_time/src/gregorian/date_generators.cpp \ - 3rdParty/Boost/libs/date_time/src/gregorian/greg_month.cpp \ - 3rdParty/Boost/libs/date_time/src/gregorian/greg_weekday.cpp \ - 3rdParty/Boost/libs/date_time/src/gregorian/gregorian_types.cpp \ - 3rdParty/Boost/libs/date_time/src/posix_time/posix_time_types.cpp \ - 3rdParty/Boost/libs/system/src/error_code.cpp \ - 3rdParty/Boost/libs/thread/src/tss_null.cpp \ - 3rdParty/Boost/libs/signals/src/connection.cpp \ - 3rdParty/Boost/libs/signals/src/named_slot_map.cpp \ - 3rdParty/Boost/libs/signals/src/signal_base.cpp \ - 3rdParty/Boost/libs/signals/src/slot.cpp \ - 3rdParty/Boost/libs/signals/src/trackable.cpp \ - 3rdParty/Boost/libs/filesystem/src/operations.cpp \ - 3rdParty/Boost/libs/filesystem/src/path.cpp \ - 3rdParty/Boost/libs/filesystem/src/portability.cpp \ - 3rdParty/Boost/libs/filesystem/src/utf8_codecvt_facet.cpp \ - 3rdParty/Boost/libs/regex/src/c_regex_traits.cpp \ - 3rdParty/Boost/libs/regex/src/cpp_regex_traits.cpp \ - 3rdParty/Boost/libs/regex/src/cregex.cpp \ - 3rdParty/Boost/libs/regex/src/fileiter.cpp \ - 3rdParty/Boost/libs/regex/src/icu.cpp \ - 3rdParty/Boost/libs/regex/src/instances.cpp \ - 3rdParty/Boost/libs/regex/src/posix_api.cpp \ - 3rdParty/Boost/libs/regex/src/regex.cpp \ - 3rdParty/Boost/libs/regex/src/regex_debug.cpp \ - 3rdParty/Boost/libs/regex/src/regex_raw_buffer.cpp \ - 3rdParty/Boost/libs/regex/src/regex_traits_defaults.cpp \ - 3rdParty/Boost/libs/regex/src/static_mutex.cpp \ - 3rdParty/Boost/libs/regex/src/w32_regex_traits.cpp \ - 3rdParty/Boost/libs/regex/src/wc_regex_traits.cpp \ - 3rdParty/Boost/libs/regex/src/wide_posix_api.cpp \ - 3rdParty/Boost/libs/regex/src/winstances.cpp \ - 3rdParty/Boost/libs/regex/src/usinstances.cpp - -ifeq ($(WIN32),1) -# The WINNT flag is the boost default (Windows XP Target) -CXXFLAGS += -D_WIN32_WINNT=0x0501 -# Only needed for CygWin -CXXFLAGS += -D__USE_W32_SOCKETS -BOOST_SOURCES += \ - 3rdParty/Boost/win32_stubs.cpp \ - 3rdParty/Boost/libs/thread/src/win32/exceptions.cpp \ - 3rdParty/Boost/libs/thread/src/win32/thread.cpp \ - 3rdParty/Boost/libs/thread/src/win32/tss_dll.cpp \ - 3rdParty/Boost/libs/thread/src/win32/tss_pe.cpp -else -LIBS += -lpthread -BOOST_SOURCES += \ - 3rdParty/Boost/libs/thread/src/pthread/exceptions.cpp \ - 3rdParty/Boost/libs/thread/src/pthread/once.cpp \ - 3rdParty/Boost/libs/thread/src/pthread/thread.cpp -endif - -BOOST_OBJECTS = \ - $(BOOST_SOURCES:.cpp=.o) diff --git a/3rdParty/CppUnit/Makefile.inc b/3rdParty/CppUnit/Makefile.inc deleted file mode 100644 index 3749144..0000000 --- a/3rdParty/CppUnit/Makefile.inc +++ /dev/null @@ -1,43 +0,0 @@ -CXXFLAGS += -isystem 3rdParty/CppUnit - -CPPUNIT_TARGET = 3rdParty/CppUnit/CppUnit.a - -CPPUNIT_SOURCES = \ - 3rdParty/CppUnit/src/TextTestRunner.cpp \ - 3rdParty/CppUnit/src/TextTestProgressListener.cpp \ - 3rdParty/CppUnit/src/BriefTestProgressListener.cpp \ - 3rdParty/CppUnit/src/TextOutputter.cpp \ - 3rdParty/CppUnit/src/XmlOutputter.cpp \ - 3rdParty/CppUnit/src/XmlElement.cpp \ - 3rdParty/CppUnit/src/XmlDocument.cpp \ - 3rdParty/CppUnit/src/StringTools.cpp \ - 3rdParty/CppUnit/src/DefaultProtector.cpp \ - 3rdParty/CppUnit/src/Protector.cpp \ - 3rdParty/CppUnit/src/ProtectorChain.cpp \ - 3rdParty/CppUnit/src/SynchronizedObject.cpp \ - 3rdParty/CppUnit/src/SourceLine.cpp \ - 3rdParty/CppUnit/src/TestRunner.cpp \ - 3rdParty/CppUnit/src/TestFactoryRegistry.cpp \ - 3rdParty/CppUnit/src/TestSuite.cpp \ - 3rdParty/CppUnit/src/TestSuiteBuilderContext.cpp \ - 3rdParty/CppUnit/src/TestResult.cpp \ - 3rdParty/CppUnit/src/TestResultCollector.cpp \ - 3rdParty/CppUnit/src/TestSuccessListener.cpp \ - 3rdParty/CppUnit/src/TestComposite.cpp \ - 3rdParty/CppUnit/src/TestCase.cpp \ - 3rdParty/CppUnit/src/TestFailure.cpp \ - 3rdParty/CppUnit/src/TestLeaf.cpp \ - 3rdParty/CppUnit/src/TestNamer.cpp \ - 3rdParty/CppUnit/src/Asserter.cpp \ - 3rdParty/CppUnit/src/TypeInfoHelper.cpp \ - 3rdParty/CppUnit/src/Exception.cpp \ - 3rdParty/CppUnit/src/Message.cpp \ - 3rdParty/CppUnit/src/AdditionalMessage.cpp \ - 3rdParty/CppUnit/src/Test.cpp \ - 3rdParty/CppUnit/src/TestPath.cpp - -CPPUNIT_OBJECTS = \ - $(CPPUNIT_SOURCES:.cpp=.o) - -$(CPPUNIT_TARGET): $(CPPUNIT_OBJECTS) - $(QUIET_AR)$(AR) $(ARFLAGS) $@ $(CPPUNIT_OBJECTS) diff --git a/3rdParty/Expat/Makefile.inc b/3rdParty/Expat/Makefile.inc deleted file mode 100644 index a241cf1..0000000 --- a/3rdParty/Expat/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -EXPAT_TARGET = 3rdParty/Expat/Expat.a - -EXPAT_SOURCES = \ - 3rdParty/Expat/src/xmltok.c \ - 3rdParty/Expat/src/xmlparse.c \ - 3rdParty/Expat/src/xmlrole.c - -EXPAT_OBJECTS = \ - $(EXPAT_SOURCES:.c=.o) - -$(EXPAT_TARGET): $(EXPAT_OBJECTS) - $(QUIET_AR)$(AR) $(ARFLAGS) $@ $(EXPAT_OBJECTS) - -ifeq ($(USE_BUNDLED_EXPAT),yes) -CPPFLAGS += -isystem 3rdParty/Expat -isystem 3rdParty/Expat/src -DHAVE_EXPAT_CONFIG_H -DXML_STATIC -BUNDLED_LIBS += $(EXPAT_TARGET) -endif diff --git a/3rdParty/LibIDN/Makefile.inc b/3rdParty/LibIDN/Makefile.inc deleted file mode 100644 index 2aeb34b..0000000 --- a/3rdParty/LibIDN/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -CXXFLAGS += -isystem 3rdParty/LibIDN/src -CFLAGS += -isystem 3rdParty/LibIDN/src -isystem 3rdParty/LibIDN/stubs -ifeq ($(WIN32),1) -CPPFLAGS += -DIDNA_STATIC -CFLAGS += -isystem 3rdParty/LibIDN/stubs/win32 -CFLAGS += -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp -CXXFLAGS += -isystem 3rdParty/LibIDN/stubs/win32 -endif - -LIBIDN_SOURCES += \ - 3rdParty/LibIDN/src/stringprep.c \ - 3rdParty/LibIDN/src/profiles.c \ - 3rdParty/LibIDN/src/rfc3454.c \ - 3rdParty/LibIDN/src/punycode.c \ - 3rdParty/LibIDN/src/idna.c \ - 3rdParty/LibIDN/src/toutf8.c \ - 3rdParty/LibIDN/src/nfkc.c - -LIBIDN_OBJECTS = \ - $(LIBIDN_SOURCES:.c=.o) diff --git a/3rdParty/SQLite/Makefile.inc b/3rdParty/SQLite/Makefile.inc deleted file mode 100644 index 141cfca..0000000 --- a/3rdParty/SQLite/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -SQLITE_CPPFLAGS += -isystem 3rdParty/SQLite - -SQLITE_SOURCES = \ - 3rdParty/SQLite/sqlite3.c - -SQLITE_OBJECTS = \ - $(SQLITE_SOURCES:.c=.o) diff --git a/3rdParty/ZLib/Makefile.inc b/3rdParty/ZLib/Makefile.inc deleted file mode 100644 index a30f65d..0000000 --- a/3rdParty/ZLib/Makefile.inc +++ /dev/null @@ -1,19 +0,0 @@ -CXXFLAGS += -isystem 3rdParty/ZLib/src -CFLAGS += -isystem 3rdParty/ZLib/src - -ZLIB_SOURCES += \ - 3rdParty/ZLib/src/adler32.c \ - 3rdParty/ZLib/src/compress.c \ - 3rdParty/ZLib/src/crc32.c \ - 3rdParty/ZLib/src/deflate.c \ - 3rdParty/ZLib/src/gzio.c \ - 3rdParty/ZLib/src/infback.c \ - 3rdParty/ZLib/src/inffast.c \ - 3rdParty/ZLib/src/inflate.c \ - 3rdParty/ZLib/src/inftrees.c \ - 3rdParty/ZLib/src/trees.c \ - 3rdParty/ZLib/src/uncompr.c \ - 3rdParty/ZLib/src/zutil.c - -ZLIB_OBJECTS = \ - $(ZLIB_SOURCES:.c=.o) diff --git a/Makefile b/Makefile deleted file mode 100644 index b93c85f..0000000 --- a/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -include Makefile.config - -CXXFLAGS += -I$(PWD) -CFLAGS += -I$(PWD) -ARFLAGS = rcs - -.DEFAULT_GOAL = all - -################################################################################ -# Echoing -################################################################################ - -ifneq ($(findstring $(MAKEFLAGS),s),s) -ifndef V -ifeq ($(C),0) -QUIET_MM = @echo " " "MM " $@; -QUIET_CC = @echo " " "CC " $@; -QUIET_CXX = @echo " " "CXX " $@; -QUIET_AR = @echo " " "AR " $@; -QUIET_LINK = @echo " " "LINK" $@; -QUIET_NIB = @echo " " "NIB " $@; -else -QUIET_MM = @echo " $(shell tput setaf 5)MM$(shell tput sgr0) " $@; -QUIET_CC = @echo " $(shell tput setaf 3)CC$(shell tput sgr0) " $@; -QUIET_CXX = @echo " $(shell tput setaf 2)CXX$(shell tput sgr0) " $@; -QUIET_AR = @echo " $(shell tput setaf 1)AR$(shell tput sgr0) " $@; -QUIET_LINK = @echo " $(shell tput setaf 6)LINK$(shell tput sgr0)" $@; -QUIET_NIB = @echo " $(shell tput setaf 4)NIB$(shell tput sgr0) " $@; -endif -endif -endif - -################################################################################ -# Modules -################################################################################ - -include 3rdParty/Boost/Makefile.inc -include 3rdParty/CppUnit/Makefile.inc -include 3rdParty/LibIDN/Makefile.inc -include 3rdParty/ZLib/Makefile.inc -include 3rdParty/Expat/Makefile.inc -include 3rdParty/SQLite/Makefile.inc -include Swiften/Makefile.inc -ifeq ($(BUILD_SWIFT),yes) -include Swift/Makefile.inc -endif -ifeq ($(BUILD_LIMBER),yes) -include Limber/Makefile.inc -endif -ifeq ($(BUILD_SLIMBER),yes) -include Slimber/Makefile.inc -endif -include QA/Makefile.inc -################################################################################ -# Main targets -################################################################################ - -.PHONY: all -all: $(TARGETS) - -.PHONY: install -install: $(INSTALL_TARGETS) - -.PHONY: coverage -coverage: - tools/coverage/GenerateCoverageResults.sh - -.PHONY: clean -clean: $(CLEAN_TARGETS) - -rm -rf $(CLEANFILES) - -find . \( -name "*.dep" -or -name "*.a" -or -name "*.o" -or -name "*.obj" -or -name "*.gcda" -or -name "*.gcno" -or -name "*.gcov" \) -exec rm {} \; - -################################################################################ -# Automatic dependency detection -################################################################################ - -ifeq (,$(findstring clean, $(MAKECMDGOALS))) -ifeq (,$(findstring clean-deps, $(MAKECMDGOALS))) --include $(DEPS) -endif -endif - -%/PkgInfo: - printf "APPL\77\77\77\77" > $@ - -%.dep: %.cpp - $(QUIET_MM)$(MM) -MM -MG -MT $(basename $@).o $(CPPFLAGS) $(filter-out -arch armv6 -arch i386 -arch ppc,$(CXXFLAGS)) $< > $@ - -%.dep: %.c - $(QUIET_MM)$(MM) -MM -MG -MT $(basename $@).o $(CPPFLAGS) $(filter-out -arch armv6 -arch i386 -arch ppc,$(CFLAGS)) $< > $@ - -%.dep: %.mm - $(QUIET_MM)$(MM) -MM -MG -MT $(basename $@).o $(CPPFLAGS) $(filter-out -arch armv6 -arch i386 -arch ppc,$(CXXFLAGS)) $< > $@ - -%.dep: %.m - $(QUIET_MM)$(MM) -MM -MG -MT $(basename $@).o $(CPPFLAGS) $(filter-out -arch armv6 -arch i386 -arch ppc,$(CFLAGS)) $< > $@ - -%.o: %.c - $(QUIET_CC)$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) - -%.o: %.cpp - $(QUIET_CXX)$(CXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS) - -%.o: %.mm - $(QUIET_CXX)$(CXX) -x objective-c++ -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS) - -%.o: %.m - $(QUIET_CC)$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) - -%.nib: %.xib - $(QUIET_NIB)/Developer/usr/bin/ibtool --errors --warnings --notices --output-format human-readable-text --compile $@ $< diff --git a/Makefile.config.in b/Makefile.config.in deleted file mode 100644 index 010075a..0000000 --- a/Makefile.config.in +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# Configuration Settings -# These values are filled in by 'configure' -################################################################################ - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -datadir=@datadir@ - -@SET_MAKE@ -MM=@MM@ -CXX=@CONFIG_CXX@ -CXXFLAGS=@CONFIG_CXXFLAGS@ -CC=@CONFIG_CC@ -CFLAGS=@CONFIG_CFLAGS@ -LDFLAGS=@CONFIG_LDFLAGS@ -LIBS=@CONFIG_LIBS@ @LIBS@ -HAVE_EXPAT=@HAVE_EXPAT@ -USE_BUNDLED_EXPAT=@USE_BUNDLED_EXPAT@ -HAVE_LIBXML=@CONFIG_HAVE_LIBXML@ -HAVE_OPENSSL=@CONFIG_HAVE_OPENSSL@ -HAVE_BONJOUR=@HAVE_BONJOUR@ -HAVE_AVAHI=@HAVE_AVAHI@ -WIN32=@CONFIG_WIN32@ -MACOSX=@CONFIG_MACOSX@ -BUILD_SWIFT=@BUILD_SWIFT@ -BUILD_LIMBER=@BUILD_LIMBER@ -BUILD_SLIMBER=@BUILD_SLIMBER@ -QMAKE=@QMAKE@ -ARCH=@ARCH@ diff --git a/QA/Makefile.inc b/QA/Makefile.inc deleted file mode 100644 index e86005d..0000000 --- a/QA/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -ifdef USE_VALGRIND -# Not enabled: --show-reachable=yes -TEST_RUNNER=valgrind --suppressions=QA/valgrind.supp -q --leak-check=full --track-origins=yes -endif - -include QA/UnitTest/Makefile.inc - -.PHONY: test -test: $(TEST_TARGETS) diff --git a/QA/UnitTest/Makefile.inc b/QA/UnitTest/Makefile.inc deleted file mode 100644 index f51828e..0000000 --- a/QA/UnitTest/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -UNITTEST_TARGET = QA/UnitTest/checker -UNITTEST_SOURCES += \ - QA/UnitTest/checker.cpp -UNITTEST_OBJECTS = \ - $(UNITTEST_SOURCES:.cpp=.o) - -TEST_TARGETS += check - -CLEANFILES += $(UNITTEST_TARGET) -DEPS += $(UNITTEST_SOURCES:.cpp=.dep) - -.PHONY: check -check: $(UNITTEST_TARGET) - $(TEST_RUNNER) ./$(UNITTEST_TARGET) - -$(UNITTEST_TARGET): $(CPPUNIT_TARGET) $(UNITTEST_OBJECTS) $(UNITTEST_LIBS) $(BUNDLED_LIBS) - $(QUIET_LINK)$(CXX) -o $(UNITTEST_TARGET) $(UNITTEST_OBJECTS) $(LDFLAGS) $(CPPUNIT_TARGET) $(UNITTEST_LIBS) $(BUNDLED_LIBS) $(LIBS) - diff --git a/Swift/Controllers/Makefile.inc b/Swift/Controllers/Makefile.inc deleted file mode 100644 index b145c54..0000000 --- a/Swift/Controllers/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -SWIFT_CONTROLLERS_SOURCES += \ - Swift/Controllers/ChatController.cpp \ - Swift/Controllers/ChatControllerBase.cpp \ - Swift/Controllers/MainController.cpp \ - Swift/Controllers/NickResolver.cpp \ - Swift/Controllers/RosterController.cpp \ - Swift/Controllers/XMPPRosterController.cpp \ - Swift/Controllers/MUCController.cpp \ - Swift/Controllers/EventController.cpp \ - Swift/Controllers/SoundEventController.cpp \ - Swift/Controllers/SystemTrayController.cpp - -include Swift/Controllers/UnitTest/Makefile.inc - -SWIFT_CONTROLLERS_TARGET = Swift/Controllers/Controllers.a -SWIFT_CONTROLLERS_OBJECTS = \ - $(SWIFT_CONTROLLERS_SOURCES:.cpp=.o) - -TARGETS += $(SWIFT_CONTROLLERS_TARGET) -UNITTEST_LIBS += $(SWIFT_CONTROLLERS_TARGET) -DEPS += $(SWIFT_CONTROLLERS_SOURCES:.cpp=.dep) - -$(SWIFT_CONTROLLERS_TARGET): $(SWIFT_CONTROLLERS_OBJECTS) - $(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFT_CONTROLLERS_OBJECTS) diff --git a/Swift/Controllers/UnitTest/Makefile.inc b/Swift/Controllers/UnitTest/Makefile.inc deleted file mode 100644 index 254f35d..0000000 --- a/Swift/Controllers/UnitTest/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -UNITTEST_SOURCES += \ - Swift/Controllers/UnitTest/NickResolverTest.cpp \ - Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp - diff --git a/Swift/Makefile.inc b/Swift/Makefile.inc deleted file mode 100644 index ab677af..0000000 --- a/Swift/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -include Swift/Controllers/Makefile.inc -include Swift/QtUI/Makefile.inc -include Swift/Packaging/Debian/Makefile.inc - -INSTALL_TARGETS += install-swift - -.PHONY: install-swift -install-swift: qt - install -d $(DESTDIR)$(bindir) - install Swift/QtUI/swift $(DESTDIR)$(bindir) diff --git a/Swift/Packaging/Debian/Makefile.inc b/Swift/Packaging/Debian/Makefile.inc deleted file mode 100755 index fb079ce..0000000 --- a/Swift/Packaging/Debian/Makefile.inc +++ /dev/null @@ -1,19 +0,0 @@ -DATE=`date +%Y%m%d` -SIZE=`du -s tmpusr/usr | awk '{print $1}'` -VERSION=0.3.$(DATE) -DEBPATH=Swift/Packaging/Debian -DEBNAME=swift-preview_$(VERSION)-$(ARCH).deb -$(DEBPATH)/$(DEBNAME): all - rm -rf $(DEBPATH)/tmpusr - mkdir -p $(DEBPATH)/tmpusr/usr/bin - mkdir $(DEBPATH)/tmpusr/DEBIAN - - cp Swift/QtUI/swift $(DEBPATH)/tmpusr/usr/bin - - cat $(DEBPATH)/control | sed -e"s/\%ARCH\%/$(ARCH)/" -e"s/\%VERSION\%/$(VERSION)/" -e"s/\%SIZE\%/$(SIZE)/" > $(DEBPATH)/tmpusr/DEBIAN/control - - dpkg -b $(DEBPATH)/tmpusr $(DEBPATH)/$(DEBNAME) - -.PHONY: deb -deb: $(DEBPATH)/$(DEBNAME) - diff --git a/Swift/QtUI/Makefile.inc b/Swift/QtUI/Makefile.inc deleted file mode 100644 index 3ec32d7..0000000 --- a/Swift/QtUI/Makefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -TARGETS += qt -CLEAN_TARGETS += clean-qt - -ifeq ($(WIN32),1) -QT_MAKE=nmake -else -QT_MAKE=$(MAKE) -endif - - -.PHONY: qt -qt: Swift/QtUI/Makefile Swiften/Swiften.a $(BUNDLED_LIBS) - cd Swift/QtUI && $(QT_MAKE) - -.PHONY: clean-qt -clean-qt: - if [ -f "Swift/QtUI/Makefile" ]; then \ - cd Swift/QtUI && $(QT_MAKE) clean; \ - fi - -Swift/QtUI/Makefile: Swift/QtUI/DefaultTheme.qrc Swift/QtUI/Swiften.pri - cd Swift/QtUI && $(QMAKE) Swift.pro - -Swift/QtUI/Swiften.pri: - cd Swift/QtUI && ./qmakeish.py ../../Makefile > Swiften.pri - -Swift/QtUI/DefaultTheme.qrc: - cd Swift/QtUI && ../../tools/ThemeQRC.py ../resources/themes/Default > DefaultTheme.qrc diff --git a/Swiften/Application/MacOSX/Makefile.inc b/Swiften/Application/MacOSX/Makefile.inc deleted file mode 100644 index 9443267..0000000 --- a/Swiften/Application/MacOSX/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -SWIFTEN_OBJECTIVE_SOURCES += \ - Swiften/Application/MacOSX/MacOSXApplicationInitializer.mm \ - Swiften/Application/MacOSX/MacOSXApplicationMessageDisplay.mm - -SWIFTEN_SOURCES += \ - Swiften/Application/MacOSX/MacOSXApplication.cpp diff --git a/Swiften/Application/Makefile.inc b/Swiften/Application/Makefile.inc deleted file mode 100644 index 7cc7fcb..0000000 --- a/Swiften/Application/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Application/Application.cpp \ - Swiften/Application/ApplicationMessageDisplay.cpp - -ifeq ($(MACOSX),1) -include Swiften/Application/MacOSX/Makefile.inc -endif - -include Swiften/Application/UnitTest/Makefile.inc diff --git a/Swiften/Application/UnitTest/Makefile.inc b/Swiften/Application/UnitTest/Makefile.inc deleted file mode 100644 index 47c8691..0000000 --- a/Swiften/Application/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Application/UnitTest/ApplicationTest.cpp diff --git a/Swiften/Avatars/Makefile.inc b/Swiften/Avatars/Makefile.inc deleted file mode 100644 index 4887a49..0000000 --- a/Swiften/Avatars/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Avatars/AvatarManager.cpp \ - Swiften/Avatars/AvatarStorage.cpp \ - Swiften/Avatars/AvatarFileStorage.cpp - -include Swiften/Avatars/UnitTest/Makefile.inc diff --git a/Swiften/Avatars/UnitTest/Makefile.inc b/Swiften/Avatars/UnitTest/Makefile.inc deleted file mode 100644 index 5686ee6..0000000 --- a/Swiften/Avatars/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -#UNITTEST_SOURCES += \ -# Swiften/Avatars/UnitTest/AvatarManagerTest.cpp diff --git a/Swiften/Base/Makefile.inc b/Swiften/Base/Makefile.inc deleted file mode 100644 index cf42910..0000000 --- a/Swiften/Base/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Base/String.cpp \ - Swiften/Base/ByteArray.cpp \ - Swiften/Base/IDGenerator.cpp \ - Swiften/Base/sleep.cpp - -include Swiften/Base/UnitTest/Makefile.inc diff --git a/Swiften/Base/UnitTest/Makefile.inc b/Swiften/Base/UnitTest/Makefile.inc deleted file mode 100644 index f724330..0000000 --- a/Swiften/Base/UnitTest/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Base/UnitTest/StringTest.cpp \ - Swiften/Base/UnitTest/IDGeneratorTest.cpp diff --git a/Swiften/Client/Makefile.inc b/Swiften/Client/Makefile.inc deleted file mode 100644 index 8171ed1..0000000 --- a/Swiften/Client/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Client/Client.cpp \ - Swiften/Client/ClientSession.cpp - -include Swiften/Client/UnitTest/Makefile.inc diff --git a/Swiften/Client/UnitTest/Makefile.inc b/Swiften/Client/UnitTest/Makefile.inc deleted file mode 100644 index 14dac57..0000000 --- a/Swiften/Client/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Client/UnitTest/ClientSessionTest.cpp diff --git a/Swiften/Compress/Makefile.inc b/Swiften/Compress/Makefile.inc deleted file mode 100644 index bf502fb..0000000 --- a/Swiften/Compress/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Compress/ZLibCodecompressor.cpp - -include Swiften/Compress/UnitTest/Makefile.inc diff --git a/Swiften/Compress/UnitTest/Makefile.inc b/Swiften/Compress/UnitTest/Makefile.inc deleted file mode 100644 index fcc1a2c..0000000 --- a/Swiften/Compress/UnitTest/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Compress/UnitTest/ZLibDecompressorTest.cpp \ - Swiften/Compress/UnitTest/ZLibCompressorTest.cpp diff --git a/Swiften/Disco/Makefile.inc b/Swiften/Disco/Makefile.inc deleted file mode 100644 index 5aeba07..0000000 --- a/Swiften/Disco/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Disco/CapsInfoGenerator.cpp - -include Swiften/Disco/UnitTest/Makefile.inc diff --git a/Swiften/Disco/UnitTest/Makefile.inc b/Swiften/Disco/UnitTest/Makefile.inc deleted file mode 100644 index 928664c..0000000 --- a/Swiften/Disco/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp diff --git a/Swiften/Elements/Makefile.inc b/Swiften/Elements/Makefile.inc deleted file mode 100644 index aceaac0..0000000 --- a/Swiften/Elements/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Elements/RosterPayload.cpp \ - Swiften/Elements/Payload.cpp \ - Swiften/Elements/Stanza.cpp \ - Swiften/Elements/Element.cpp \ - Swiften/Elements/DiscoInfo.cpp \ - Swiften/Elements/IQ.cpp - -include Swiften/Elements/UnitTest/Makefile.inc diff --git a/Swiften/Elements/UnitTest/Makefile.inc b/Swiften/Elements/UnitTest/Makefile.inc deleted file mode 100644 index 848aa19..0000000 --- a/Swiften/Elements/UnitTest/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Elements/UnitTest/StanzaTest.cpp \ - Swiften/Elements/UnitTest/IQTest.cpp diff --git a/Swiften/EventLoop/Cocoa/Makefile.inc b/Swiften/EventLoop/Cocoa/Makefile.inc deleted file mode 100644 index aaa038e..0000000 --- a/Swiften/EventLoop/Cocoa/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -SWIFTEN_OBJECTIVE_SOURCES += \ - Swiften/EventLoop/Cocoa/CocoaEvent.mm \ - Swiften/EventLoop/Cocoa/CocoaEventLoop.mm diff --git a/Swiften/EventLoop/Makefile.inc b/Swiften/EventLoop/Makefile.inc deleted file mode 100644 index 78ebdcd..0000000 --- a/Swiften/EventLoop/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/EventLoop/EventOwner.cpp \ - Swiften/EventLoop/EventLoop.cpp \ - Swiften/EventLoop/SimpleEventLoop.cpp \ - Swiften/EventLoop/MainEventLoop.cpp - -ifeq ($(MACOSX),1) -include Swiften/EventLoop/Cocoa/Makefile.inc -endif -include Swiften/EventLoop/UnitTest/Makefile.inc diff --git a/Swiften/EventLoop/UnitTest/Makefile.inc b/Swiften/EventLoop/UnitTest/Makefile.inc deleted file mode 100644 index 5eec2da..0000000 --- a/Swiften/EventLoop/UnitTest/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp \ - Swiften/EventLoop/UnitTest/EventLoopTest.cpp diff --git a/Swiften/Events/Makefile.inc b/Swiften/Events/Makefile.inc deleted file mode 100644 index e69de29..0000000 diff --git a/Swiften/Examples/EchoBot/Makefile.inc b/Swiften/Examples/EchoBot/Makefile.inc deleted file mode 100644 index beab023..0000000 --- a/Swiften/Examples/EchoBot/Makefile.inc +++ /dev/null @@ -1,14 +0,0 @@ -ECHOBOT_TARGET = Swiften/Examples/EchoBot/EchoBot -ECHOBOT_SOURCES += \ - Swiften/Examples/EchoBot/EchoBot.cpp -ECHOBOT_OBJECTS = \ - $(ECHOBOT_SOURCES:.cpp=.o) - -CLEANFILES += $(ECHOBOT_TARGET) -DEPS += $(ECHOBOT_SOURCES:.cpp=.dep) -EXAMPLES_TARGETS += $(ECHOBOT_TARGET) - -EchoBot: $(ECHOBOT_TARGET) - -$(ECHOBOT_TARGET): $(SWIFTEN_TARGET) $(ECHOBOT_OBJECTS) - $(QUIET_LINK)$(CXX) -o $(ECHOBOT_TARGET) $(ECHOBOT_OBJECTS) $(LDFLAGS) $(SWIFTEN_TARGET) $(LIBS) diff --git a/Swiften/Examples/Makefile.inc b/Swiften/Examples/Makefile.inc deleted file mode 100644 index 3c485e2..0000000 --- a/Swiften/Examples/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -include Swiften/Examples/EchoBot/Makefile.inc - -.PHONY: examples -examples: $(EXAMPLES_TARGETS) diff --git a/Swiften/History/Makefile.inc b/Swiften/History/Makefile.inc deleted file mode 100644 index fbd917b..0000000 --- a/Swiften/History/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/History/HistoryManager.cpp \ - Swiften/History/SQLiteHistoryManager.cpp - -include Swiften/History/UnitTest/Makefile.inc diff --git a/Swiften/History/UnitTest/Makefile.inc b/Swiften/History/UnitTest/Makefile.inc deleted file mode 100644 index b1b44f8..0000000 --- a/Swiften/History/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/History/UnitTest/SQLiteHistoryManagerTest.cpp diff --git a/Swiften/JID/Makefile.inc b/Swiften/JID/Makefile.inc deleted file mode 100644 index f60cb3c..0000000 --- a/Swiften/JID/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/JID/JID.cpp - -include Swiften/JID/UnitTest/Makefile.inc diff --git a/Swiften/JID/UnitTest/Makefile.inc b/Swiften/JID/UnitTest/Makefile.inc deleted file mode 100644 index e896fd7..0000000 --- a/Swiften/JID/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/JID/UnitTest/JIDTest.cpp diff --git a/Swiften/LinkLocal/DNSSD/Avahi/Makefile.inc b/Swiften/LinkLocal/DNSSD/Avahi/Makefile.inc deleted file mode 100644 index 6150dc1..0000000 --- a/Swiften/LinkLocal/DNSSD/Avahi/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc b/Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc deleted file mode 100644 index efa329d..0000000 --- a/Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.cpp \ - Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp diff --git a/Swiften/LinkLocal/DNSSD/Fake/Makefile.inc b/Swiften/LinkLocal/DNSSD/Fake/Makefile.inc deleted file mode 100644 index 316d061..0000000 --- a/Swiften/LinkLocal/DNSSD/Fake/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuery.cpp \ - Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.cpp diff --git a/Swiften/LinkLocal/DNSSD/Makefile.inc b/Swiften/LinkLocal/DNSSD/Makefile.inc deleted file mode 100644 index 4b014f3..0000000 --- a/Swiften/LinkLocal/DNSSD/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/LinkLocal/DNSSD/DNSSDServiceID.cpp \ - Swiften/LinkLocal/DNSSD/DNSSDQuerier.cpp \ - Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.cpp \ - Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.cpp \ - Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.cpp \ - Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp \ - Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp - -ifeq ($(HAVE_BONJOUR),yes) -include Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc -endif -ifeq ($(HAVE_AVAHI),yes) -include Swiften/LinkLocal/DNSSD/Avahi/Makefile.inc -endif - -include Swiften/LinkLocal/DNSSD/Fake/Makefile.inc diff --git a/Swiften/LinkLocal/Makefile.inc b/Swiften/LinkLocal/Makefile.inc deleted file mode 100644 index 715d686..0000000 --- a/Swiften/LinkLocal/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/LinkLocal/LinkLocalServiceBrowser.cpp \ - Swiften/LinkLocal/LinkLocalService.cpp \ - Swiften/LinkLocal/LinkLocalServiceInfo.cpp \ - Swiften/LinkLocal/IncomingLinkLocalSession.cpp \ - Swiften/LinkLocal/OutgoingLinkLocalSession.cpp \ - Swiften/LinkLocal/LinkLocalConnector.cpp - -include Swiften/LinkLocal/DNSSD/Makefile.inc -include Swiften/LinkLocal/UnitTest/Makefile.inc diff --git a/Swiften/LinkLocal/UnitTest/Makefile.inc b/Swiften/LinkLocal/UnitTest/Makefile.inc deleted file mode 100644 index 330808a..0000000 --- a/Swiften/LinkLocal/UnitTest/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/LinkLocal/UnitTest/LinkLocalServiceTest.cpp \ - Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp \ - Swiften/LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp \ - Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp diff --git a/Swiften/MUC/Makefile.inc b/Swiften/MUC/Makefile.inc deleted file mode 100644 index dc47d97..0000000 --- a/Swiften/MUC/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/MUC/MUCRegistry.cpp \ - Swiften/MUC/MUC.cpp \ - Swiften/MUC/MUCOccupant.cpp diff --git a/Swiften/Makefile.inc b/Swiften/Makefile.inc deleted file mode 100644 index d7c3340..0000000 --- a/Swiften/Makefile.inc +++ /dev/null @@ -1,63 +0,0 @@ -include Swiften/Base/Makefile.inc -include Swiften/Application/Makefile.inc -include Swiften/EventLoop/Makefile.inc -include Swiften/StringCodecs/Makefile.inc -include Swiften/JID/Makefile.inc -include Swiften/Elements/Makefile.inc -include Swiften/Events/Makefile.inc -include Swiften/StreamStack/Makefile.inc -include Swiften/Serializer/Makefile.inc -include Swiften/Parser/Makefile.inc -include Swiften/MUC/Makefile.inc -include Swiften/Network/Makefile.inc -include Swiften/Session/Makefile.inc -include Swiften/Client/Makefile.inc -include Swiften/TLS/Makefile.inc -include Swiften/SASL/Makefile.inc -include Swiften/Compress/Makefile.inc -include Swiften/Queries/Makefile.inc -include Swiften/Roster/Makefile.inc -include Swiften/Disco/Makefile.inc -include Swiften/Presence/Makefile.inc -include Swiften/Notifier/Makefile.inc -include Swiften/History/Makefile.inc -include Swiften/Avatars/Makefile.inc -include Swiften/Server/Makefile.inc -include Swiften/LinkLocal/Makefile.inc - -CPPFLAGS += $(SQLITE_CPPFLAGS) - -SWIFTEN_TARGET = Swiften/Swiften.a -SWIFTEN_OBJECTS = \ - $(SWIFTEN_SOURCES:.cpp=.o) \ - $(patsubst %.mm, %.o, $(patsubst %.m, %.o, $(SWIFTEN_OBJECTIVE_SOURCES))) \ - $(LIBIDN_OBJECTS) \ - $(BOOST_OBJECTS) \ - $(ZLIB_OBJECTS) \ - $(SQLITE_OBJECTS) -SWIFTEN_HEADERS += \ - Swiften/config.h - -TARGETS += $(SWIFTEN_TARGET) -INSTALL_TARGETS += install-swiften -UNITTEST_LIBS += $(SWIFTEN_TARGET) -DEPS += \ - $(SWIFTEN_SOURCES:.cpp=.dep) -//TODO: Add objective stuff - -.PHONY: lib -lib: $(SWIFTEN_TARGET) - -$(SWIFTEN_TARGET): $(SWIFTEN_OBJECTS) - $(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFTEN_OBJECTS) - -.PHONY: install-swiften -install-swiften: $(SWIFTEN_TARGET) $(SWIFTEN_HEADERS) - install -d $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) - install -d $(DESTDIR)$(includedir)/Swiften/3rdParty - rsync -a 3rdParty/Boost/boost $(DESTDIR)$(includedir)/Swiften/3rdParty/Boost - for header in $(SWIFTEN_HEADERS); do headerdir=$(includedir)/`dirname $$header`; echo $$header install -d $(DESTDIR)$$headerdir; install $$header $(DESTDIR)$$headerdir; done - install $(SWIFTEN_TARGET) $(DESTDIR)$(libdir) - -include Swiften/QA/Makefile.inc -include Swiften/Examples/Makefile.inc diff --git a/Swiften/Network/Makefile.inc b/Swiften/Network/Makefile.inc deleted file mode 100644 index 94a8727..0000000 --- a/Swiften/Network/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Network/HostAddress.cpp \ - Swiften/Network/DomainNameResolver.cpp \ - Swiften/Network/ConnectionFactory.cpp \ - Swiften/Network/BoostConnection.cpp \ - Swiften/Network/BoostConnectionFactory.cpp \ - Swiften/Network/BoostConnectionServer.cpp \ - Swiften/Network/ConnectionServer.cpp \ - Swiften/Network/BoostIOServiceThread.cpp \ - Swiften/Network/Timer.cpp - -include Swiften/Network/UnitTest/Makefile.inc diff --git a/Swiften/Network/UnitTest/Makefile.inc b/Swiften/Network/UnitTest/Makefile.inc deleted file mode 100644 index 4f157f6..0000000 --- a/Swiften/Network/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Network/UnitTest/HostAddressTest.cpp diff --git a/Swiften/Notifier/Makefile.inc b/Swiften/Notifier/Makefile.inc deleted file mode 100644 index 6d7e79a..0000000 --- a/Swiften/Notifier/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Notifier/Notifier.cpp - -ifeq ($(HAVE_GROWL),yes) - SWIFTEN_SOURCES += \ - Swiften/Notifier/GrowlNotifier.cpp -endif diff --git a/Swiften/Parser/Makefile.inc b/Swiften/Parser/Makefile.inc deleted file mode 100644 index f47ae29..0000000 --- a/Swiften/Parser/Makefile.inc +++ /dev/null @@ -1,32 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Parser/XMLParser.cpp \ - Swiften/Parser/XMLParserClient.cpp \ - Swiften/Parser/XMLParserFactory.cpp \ - Swiften/Parser/PlatformXMLParserFactory.cpp \ - Swiften/Parser/XMPPParser.cpp \ - Swiften/Parser/XMPPParserClient.cpp \ - Swiften/Parser/MessageParser.cpp \ - Swiften/Parser/IQParser.cpp \ - Swiften/Parser/PresenceParser.cpp \ - Swiften/Parser/StreamFeaturesParser.cpp \ - Swiften/Parser/CompressParser.cpp \ - Swiften/Parser/AuthRequestParser.cpp \ - Swiften/Parser/StanzaParser.cpp \ - Swiften/Parser/ElementParser.cpp \ - Swiften/Parser/PayloadParser.cpp \ - Swiften/Parser/PayloadParserFactory.cpp \ - Swiften/Parser/PayloadParserFactoryCollection.cpp \ - Swiften/Parser/SerializingParser.cpp - -ifeq ($(HAVE_LIBXML),yes) -SWIFTEN_SOURCES += \ - Swiften/Parser/LibXMLParser.cpp -endif - -ifeq ($(HAVE_EXPAT),yes) -SWIFTEN_SOURCES += \ - Swiften/Parser/ExpatParser.cpp -endif - -include Swiften/Parser/PayloadParsers/Makefile.inc -include Swiften/Parser/UnitTest/Makefile.inc diff --git a/Swiften/Parser/PayloadParsers/Makefile.inc b/Swiften/Parser/PayloadParsers/Makefile.inc deleted file mode 100644 index 55017e9..0000000 --- a/Swiften/Parser/PayloadParsers/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Parser/PayloadParsers/BodyParser.cpp \ - Swiften/Parser/PayloadParsers/PriorityParser.cpp \ - Swiften/Parser/PayloadParsers/StatusParser.cpp \ - Swiften/Parser/PayloadParsers/StatusShowParser.cpp \ - Swiften/Parser/PayloadParsers/SoftwareVersionParser.cpp \ - Swiften/Parser/PayloadParsers/SecurityLabelParser.cpp \ - Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp \ - Swiften/Parser/PayloadParsers/DiscoInfoParser.cpp \ - Swiften/Parser/PayloadParsers/ErrorParser.cpp \ - Swiften/Parser/PayloadParsers/RosterParser.cpp \ - Swiften/Parser/PayloadParsers/ResourceBindParser.cpp \ - Swiften/Parser/PayloadParsers/VCardUpdateParser.cpp \ - Swiften/Parser/PayloadParsers/VCardParser.cpp \ - Swiften/Parser/PayloadParsers/RawXMLPayloadParser.cpp \ - Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp - -include Swiften/Parser/PayloadParsers/UnitTest/Makefile.inc diff --git a/Swiften/Parser/PayloadParsers/UnitTest/Makefile.inc b/Swiften/Parser/PayloadParsers/UnitTest/Makefile.inc deleted file mode 100644 index d7d419e..0000000 --- a/Swiften/Parser/PayloadParsers/UnitTest/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Parser/PayloadParsers/UnitTest/BodyParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/PriorityParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/StatusShowParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/SoftwareVersionParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/RosterParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/StatusParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/DiscoInfoParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/ResourceBindParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/SecurityLabelParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/VCardParserTest.cpp \ - Swiften/Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp diff --git a/Swiften/Parser/UnitTest/Makefile.inc b/Swiften/Parser/UnitTest/Makefile.inc deleted file mode 100644 index be570d2..0000000 --- a/Swiften/Parser/UnitTest/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp \ - Swiften/Parser/UnitTest/XMPPParserTest.cpp \ - Swiften/Parser/UnitTest/StanzaParserTest.cpp \ - Swiften/Parser/UnitTest/MessageParserTest.cpp \ - Swiften/Parser/UnitTest/PresenceParserTest.cpp \ - Swiften/Parser/UnitTest/IQParserTest.cpp \ - Swiften/Parser/UnitTest/StreamFeaturesParserTest.cpp \ - Swiften/Parser/UnitTest/SerializingParserTest.cpp \ - Swiften/Parser/UnitTest/XMLParserTest.cpp diff --git a/Swiften/Presence/Makefile.inc b/Swiften/Presence/Makefile.inc deleted file mode 100644 index ca8c95e..0000000 --- a/Swiften/Presence/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Presence/PresenceOracle.cpp - -include Swiften/Presence/UnitTest/Makefile.inc diff --git a/Swiften/Presence/UnitTest/Makefile.inc b/Swiften/Presence/UnitTest/Makefile.inc deleted file mode 100644 index e69de29..0000000 diff --git a/Swiften/QA/ClientTest/Makefile.inc b/Swiften/QA/ClientTest/Makefile.inc deleted file mode 100644 index b9ab167..0000000 --- a/Swiften/QA/ClientTest/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -CLIENTTEST_TARGET = Swiften/QA/ClientTest/ClientTest -CLIENTTEST_SOURCES += \ - Swiften/QA/ClientTest/ClientTest.cpp -CLIENTTEST_OBJECTS = \ - $(CLIENTTEST_SOURCES:.cpp=.o) - -TEST_TARGETS += ClientTest - -CLEANFILES += $(CLIENTTEST_TARGET) -DEPS += $(CLIENTTEST_SOURCES:.cpp=.dep) - -$(CLIENTTEST_TARGET): $(SWIFTEN_TARGET) $(CLIENTTEST_OBJECTS) $(BUNDLED_LIBS) - $(QUIET_LINK)$(CXX) -o $(CLIENTTEST_TARGET) $(CLIENTTEST_OBJECTS) $(LDFLAGS) $(CPPCLIENT_LDFLAGS) $(SWIFTEN_TARGET) $(BUNDLED_LIBS) $(LIBS) - -.PHONY: ClientTest -ClientTest: $(CLIENTTEST_TARGET) - $(TEST_RUNNER) $(CLIENTTEST_TARGET) diff --git a/Swiften/QA/Makefile.inc b/Swiften/QA/Makefile.inc deleted file mode 100644 index 831b443..0000000 --- a/Swiften/QA/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -include Swiften/QA/NetworkTest/Makefile.inc -include Swiften/QA/ClientTest/Makefile.inc diff --git a/Swiften/QA/NetworkTest/Makefile.inc b/Swiften/QA/NetworkTest/Makefile.inc deleted file mode 100644 index 57c97a1..0000000 --- a/Swiften/QA/NetworkTest/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -NETWORKTEST_TARGET += Swiften/QA/NetworkTest/checker -NETWORKTEST_SOURCES += \ - Swiften/QA/NetworkTest/DomainNameResolverTest.cpp \ - Swiften/QA/NetworkTest/BoostConnectionTest.cpp \ - Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp \ - QA/UnitTest/checker.cpp -NETWORKTEST_OBJECTS = \ - $(NETWORKTEST_SOURCES:.cpp=.o) - -TEST_TARGETS += NetworkTest - -CLEANFILES += $(NETWORKTEST_TARGET) -DEPS += $(NETWORKTEST_SOURCES:.cpp=.dep) - -$(NETWORKTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(NETWORKTEST_OBJECTS) $(BUNDLED_LIBS) - $(QUIET_LINK)$(CXX) -o $(NETWORKTEST_TARGET) $(NETWORKTEST_OBJECTS) $(LDFLAGS) $(CPPNETWORK_LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(BUNDLED_LIBS) $(LIBS) - -.PHONY: NetworkTest -NetworkTest: $(NETWORKTEST_TARGET) - $(TEST_RUNNER) $(NETWORKTEST_TARGET) diff --git a/Swiften/Queries/Makefile.inc b/Swiften/Queries/Makefile.inc deleted file mode 100644 index 53a712d..0000000 --- a/Swiften/Queries/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Queries/IQRouter.cpp \ - Swiften/Queries/IQHandler.cpp \ - Swiften/Queries/IQChannel.cpp \ - Swiften/Queries/Request.cpp - -include Swiften/Queries/Responders/Makefile.inc -include Swiften/Queries/UnitTest/Makefile.inc diff --git a/Swiften/Queries/Responders/Makefile.inc b/Swiften/Queries/Responders/Makefile.inc deleted file mode 100644 index 5049440..0000000 --- a/Swiften/Queries/Responders/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Queries/Responders/SoftwareVersionResponder.cpp \ - Swiften/Queries/Responders/DiscoInfoResponder.cpp - -include Swiften/Queries/Responders/UnitTest/Makefile.inc diff --git a/Swiften/Queries/Responders/UnitTest/Makefile.inc b/Swiften/Queries/Responders/UnitTest/Makefile.inc deleted file mode 100644 index 8f06682..0000000 --- a/Swiften/Queries/Responders/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp diff --git a/Swiften/Queries/UnitTest/Makefile.inc b/Swiften/Queries/UnitTest/Makefile.inc deleted file mode 100644 index a269c11..0000000 --- a/Swiften/Queries/UnitTest/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Queries/UnitTest/IQRouterTest.cpp \ - Swiften/Queries/UnitTest/RequestTest.cpp \ - Swiften/Queries/UnitTest/ResponderTest.cpp diff --git a/Swiften/Roster/Makefile.inc b/Swiften/Roster/Makefile.inc deleted file mode 100644 index 7c5b007..0000000 --- a/Swiften/Roster/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Roster/ContactRosterItem.cpp \ - Swiften/Roster/Roster.cpp \ - Swiften/Roster/XMPPRoster.cpp - -include Swiften/Roster/UnitTest/Makefile.inc diff --git a/Swiften/Roster/UnitTest/Makefile.inc b/Swiften/Roster/UnitTest/Makefile.inc deleted file mode 100644 index 5631641..0000000 --- a/Swiften/Roster/UnitTest/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Roster/UnitTest/RosterTest.cpp \ - Swiften/Roster/UnitTest/OfflineRosterFilterTest.cpp - diff --git a/Swiften/SASL/Makefile.inc b/Swiften/SASL/Makefile.inc deleted file mode 100644 index e6c658f..0000000 --- a/Swiften/SASL/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/SASL/PLAINMessage.cpp - -include Swiften/SASL/UnitTest/Makefile.inc diff --git a/Swiften/SASL/UnitTest/Makefile.inc b/Swiften/SASL/UnitTest/Makefile.inc deleted file mode 100644 index e985898..0000000 --- a/Swiften/SASL/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/SASL/UnitTest/PLAINMessageTest.cpp diff --git a/Swiften/Serializer/Makefile.inc b/Swiften/Serializer/Makefile.inc deleted file mode 100644 index 5fbe57a..0000000 --- a/Swiften/Serializer/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Serializer/ElementSerializer.cpp \ - Swiften/Serializer/CompressRequestSerializer.cpp \ - Swiften/Serializer/AuthRequestSerializer.cpp \ - Swiften/Serializer/StreamFeaturesSerializer.cpp \ - Swiften/Serializer/XMPPSerializer.cpp \ - Swiften/Serializer/StanzaSerializer.cpp \ - Swiften/Serializer/PresenceSerializer.cpp \ - Swiften/Serializer/MessageSerializer.cpp \ - Swiften/Serializer/PayloadSerializer.cpp \ - Swiften/Serializer/PayloadSerializerCollection.cpp - -include Swiften/Serializer/UnitTest/Makefile.inc -include Swiften/Serializer/XML/Makefile.inc -include Swiften/Serializer/PayloadSerializers/Makefile.inc diff --git a/Swiften/Serializer/PayloadSerializers/Makefile.inc b/Swiften/Serializer/PayloadSerializers/Makefile.inc deleted file mode 100644 index 9bfbeee..0000000 --- a/Swiften/Serializer/PayloadSerializers/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Serializer/PayloadSerializers/SoftwareVersionSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp \ - Swiften/Serializer/PayloadSerializers/ErrorSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/RosterSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/CapsInfoSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/ResourceBindSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp \ - Swiften/Serializer/PayloadSerializers/VCardUpdateSerializer.cpp - -include Swiften/Serializer/PayloadSerializers/UnitTest/Makefile.inc diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/Makefile.inc b/Swiften/Serializer/PayloadSerializers/UnitTest/Makefile.inc deleted file mode 100644 index 73887a1..0000000 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/ErrorSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/ResourceBindSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/PrioritySerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/StatusSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/StatusShowSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/SoftwareVersionSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp \ - Swiften/Serializer/PayloadSerializers/UnitTest/VCardUpdateSerializerTest.cpp diff --git a/Swiften/Serializer/UnitTest/Makefile.inc b/Swiften/Serializer/UnitTest/Makefile.inc deleted file mode 100644 index 818663b..0000000 --- a/Swiften/Serializer/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Serializer/UnitTest/StreamFeaturesSerializerTest.cpp diff --git a/Swiften/Serializer/XML/Makefile.inc b/Swiften/Serializer/XML/Makefile.inc deleted file mode 100644 index 6daca82..0000000 --- a/Swiften/Serializer/XML/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Serializer/XML/XMLNode.cpp \ - Swiften/Serializer/XML/XMLElement.cpp - -include Swiften/Serializer/XML/UnitTest/Makefile.inc diff --git a/Swiften/Serializer/XML/UnitTest/Makefile.inc b/Swiften/Serializer/XML/UnitTest/Makefile.inc deleted file mode 100644 index fa00b76..0000000 --- a/Swiften/Serializer/XML/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Serializer/XML/UnitTest/XMLElementTest.cpp diff --git a/Swiften/Server/Makefile.inc b/Swiften/Server/Makefile.inc deleted file mode 100644 index ae38335..0000000 --- a/Swiften/Server/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Server/ServerSession.cpp \ - Swiften/Server/ServerFromClientSession.cpp \ - Swiften/Server/ServerStanzaRouter.cpp \ - Swiften/Server/UserRegistry.cpp \ - Swiften/Server/SimpleUserRegistry.cpp - -include Swiften/Server/UnitTest/Makefile.inc diff --git a/Swiften/Server/UnitTest/Makefile.inc b/Swiften/Server/UnitTest/Makefile.inc deleted file mode 100644 index a61ec06..0000000 --- a/Swiften/Server/UnitTest/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/Server/UnitTest/ServerStanzaRouterTest.cpp diff --git a/Swiften/Session/Makefile.inc b/Swiften/Session/Makefile.inc deleted file mode 100644 index faa73c8..0000000 --- a/Swiften/Session/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/Session/Session.cpp diff --git a/Swiften/StreamStack/Makefile.inc b/Swiften/StreamStack/Makefile.inc deleted file mode 100644 index 51f7b68..0000000 --- a/Swiften/StreamStack/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/StreamStack/XMPPLayer.cpp \ - Swiften/StreamStack/StreamStack.cpp \ - Swiften/StreamStack/LowLayer.cpp \ - Swiften/StreamStack/HighLayer.cpp \ - Swiften/StreamStack/WhitespacePingLayer.cpp \ - Swiften/StreamStack/TLSLayerFactory.cpp \ - Swiften/StreamStack/PlatformTLSLayerFactory.cpp - -ifeq ($(HAVE_OPENSSL),yes) -SWIFTEN_SOURCES += \ - Swiften/StreamStack/OpenSSLLayer.cpp -endif - -include Swiften/StreamStack/UnitTest/Makefile.inc diff --git a/Swiften/StreamStack/UnitTest/Makefile.inc b/Swiften/StreamStack/UnitTest/Makefile.inc deleted file mode 100644 index dba5f5a..0000000 --- a/Swiften/StreamStack/UnitTest/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp \ - Swiften/StreamStack/UnitTest/StreamStackTest.cpp diff --git a/Swiften/StringCodecs/Makefile.inc b/Swiften/StringCodecs/Makefile.inc deleted file mode 100644 index dd91014..0000000 --- a/Swiften/StringCodecs/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/StringCodecs/Base64.cpp \ - Swiften/StringCodecs/SHA1.cpp - -include Swiften/StringCodecs/UnitTest/Makefile.inc diff --git a/Swiften/StringCodecs/UnitTest/Makefile.inc b/Swiften/StringCodecs/UnitTest/Makefile.inc deleted file mode 100644 index ce9fd60..0000000 --- a/Swiften/StringCodecs/UnitTest/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -UNITTEST_SOURCES += \ - Swiften/StringCodecs/UnitTest/Base64Test.cpp \ - Swiften/StringCodecs/UnitTest/SHA1Test.cpp diff --git a/Swiften/TLS/Makefile.inc b/Swiften/TLS/Makefile.inc deleted file mode 100644 index 6318a02..0000000 --- a/Swiften/TLS/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(HAVE_OPENSSL),yes) -include Swiften/TLS/OpenSSL/Makefile.inc -endif diff --git a/Swiften/TLS/OpenSSL/Makefile.inc b/Swiften/TLS/OpenSSL/Makefile.inc deleted file mode 100644 index 5bda771..0000000 --- a/Swiften/TLS/OpenSSL/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -SWIFTEN_SOURCES += \ - Swiften/TLS/OpenSSL/OpenSSLContext.cpp diff --git a/autoconf/autogen.sh b/autoconf/autogen.sh deleted file mode 100755 index 059dbbd..0000000 --- a/autoconf/autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -rm -f aclocal.m4 -autoheader -aclocal -I autoconf -autoconf diff --git a/autoconf/ax_avahi.m4 b/autoconf/ax_avahi.m4 deleted file mode 100644 index 1ea3233..0000000 --- a/autoconf/ax_avahi.m4 +++ /dev/null @@ -1,28 +0,0 @@ -# Author: Remko Tronçon - -AC_DEFUN([AX_AVAHI], -[ - AC_ARG_WITH( - [avahi], - AC_HELP_STRING([--with-avahi=@<:@ARG@:>@],[Path to Avahi installation]), - [ - WITH_AVAHI="$withval" - if test "$withval" != "no" -a "$withval" != "yes"; then - AVAHI_CPPFLAGS="-I$withval/include" - AVAHI_LDFLAGS="-L$withval/lib" - CPPFLAGS="$CPPFLAGS $AVAHI_CPPFLAGS" - LDFLAGS="$LDFLAGS $AVAHI_LDFLAGS" - fi - ], - [WITH_AVAHI="yes"]) - - if test "$WITH_AVAHI" != "no"; then - AC_CHECK_HEADER(avahi-client/client.h, - [ - HAVE_AVAHI=yes - # TODO: Check if this lib exists - AVAHI_LIBS="-lavahi-client" - ], - []) - fi -]) diff --git a/autoconf/ax_lib_expat.m4 b/autoconf/ax_lib_expat.m4 deleted file mode 100644 index 606db88..0000000 --- a/autoconf/ax_lib_expat.m4 +++ /dev/null @@ -1,279 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_lib_expat.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_LIB_EXPAT([MINIMUM-VERSION]) -# -# DESCRIPTION -# -# This macro provides tests of availability of Expat XML Parser of -# particular version or newer. This macro checks for Expat XML Parser -# headers and libraries and defines compilation flags -# -# Macro supports following options and their values: -# -# 1) Single-option usage: -# -# --with-expat -- yes, no, or path to Expat XML Parser -# installation prefix -# -# 2) Three-options usage (all options are required): -# -# --with-expat=yes -# --with-expat-inc -- path to base directory with Expat headers -# --with-expat-lib -- linker flags for Expat -# -# This macro calls: -# -# AC_SUBST(EXPAT_CFLAGS) -# AC_SUBST(EXPAT_LDFLAGS) -# AC_SUBST(EXPAT_VERSION) -- only if version requirement is used -# -# And sets: -# -# HAVE_EXPAT -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Mateusz Loskot -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - -AC_DEFUN([AX_LIB_EXPAT], -[ - AC_ARG_WITH([expat], - AC_HELP_STRING([--with-expat=@<:@ARG@:>@], - [use Expat XML Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] - ), - [ - if test "$withval" = "yes"; then - if test -f /usr/local/include/expat.h ; then - expat_prefix=/usr/local - elif test -f /usr/include/expat.h ; then - expat_prefix=/usr - else - expat_prefix="" - fi - expat_requested="yes" - elif test -d "$withval"; then - expat_prefix="$withval" - expat_requested="yes" - else - expat_prefix="" - expat_requested="no" - fi - ], - [ - dnl Default behavior is implicit yes - if test -f /usr/local/include/expat.h ; then - expat_prefix=/usr/local - elif test -f /usr/include/expat.h ; then - expat_prefix=/usr - else - expat_prefix="" - fi - ] - ) - - AC_ARG_WITH([expat-inc], - AC_HELP_STRING([--with-expat-inc=@<:@DIR@:>@], - [path to Expat XML Parser headers] - ), - [expat_include_dir="$withval"], - [expat_include_dir=""] - ) - AC_ARG_WITH([expat-lib], - AC_HELP_STRING([--with-expat-lib=@<:@ARG@:>@], - [link options for Expat XML Parser libraries] - ), - [expat_lib_flags="$withval"], - [expat_lib_flags=""] - ) - - EXPAT_CFLAGS="" - EXPAT_LDFLAGS="" - EXPAT_VERSION="" - - dnl - dnl Collect include/lib paths and flags - dnl - run_expat_test="no" - - if test -n "$expat_prefix"; then - expat_include_dir="$expat_prefix/include" - expat_lib_flags="-L$expat_prefix/lib" - expat_libs="-lexpat" - run_expat_test="yes" - elif test "$expat_requested" = "yes"; then - if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then - run_expat_test="yes" - fi - else - run_expat_test="no" - fi - - dnl - dnl Check Expat XML Parser files - dnl - if test "$run_expat_test" = "yes"; then - - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$expat_include_dir" - - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $expat_lib_flags" - LIBS="$LIBS $expat_libs" - - dnl - dnl Check Expat headers - dnl - AC_MSG_CHECKING([for Expat XML Parser headers in $expat_include_dir]) - - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[ -@%:@include - ]], - [[]] - )], - [ - EXPAT_CFLAGS="-I$expat_include_dir" - expat_header_found="yes" - AC_MSG_RESULT([found]) - ], - [ - expat_header_found="no" - AC_MSG_RESULT([not found]) - ] - ) - AC_LANG_POP([C++]) - - dnl - dnl Check Expat libraries - dnl - if test "$expat_header_found" = "yes"; then - - AC_MSG_CHECKING([for Expat XML Parser libraries]) - - AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM( - [[ -@%:@include - ]], - [[ -XML_Parser p = XML_ParserCreate(NULL); -XML_ParserFree(p); -p = NULL; - ]] - )], - [ - EXPAT_LDFLAGS="$expat_lib_flags" - EXPAT_LIBS="$expat_libs" - expat_lib_found="yes" - AC_MSG_RESULT([found]) - ], - [ - expat_lib_found="no" - AC_MSG_RESULT([not found]) - ] - ) - AC_LANG_POP([C++]) - fi - - CPPFLAGS="$saved_CPPFLAGS" - LDFLAGS="$saved_LDFLAGS" - fi - - AC_MSG_CHECKING([for Expat XML Parser]) - - if test "$run_expat_test" = "yes"; then - if test "$expat_header_found" = "yes" -a "$expat_lib_found" = "yes"; then - - AC_SUBST([EXPAT_CFLAGS]) - AC_SUBST([EXPAT_LDFLAGS]) - - HAVE_EXPAT="yes" - else - HAVE_EXPAT="no" - fi - - AC_MSG_RESULT([$HAVE_EXPAT]) - - dnl - dnl Check Expat version - dnl - if test "$HAVE_EXPAT" = "yes"; then - - expat_version_req=ifelse([$1], [], [], [$1]) - - if test -n "$expat_version_req"; then - - AC_MSG_CHECKING([if Expat XML Parser version is >= $expat_version_req]) - - if test -f "$expat_include_dir/expat.h"; then - - expat_major=`cat $expat_include_dir/expat.h | \ - grep '^#define.*XML_MAJOR_VERSION.*[0-9]$' | \ - sed -e 's/#define XML_MAJOR_VERSION.//'` - - expat_minor=`cat $expat_include_dir/expat.h | \ - grep '^#define.*XML_MINOR_VERSION.*[0-9]$' | \ - sed -e 's/#define XML_MINOR_VERSION.//'` - - expat_revision=`cat $expat_include_dir/expat.h | \ - grep '^#define.*XML_MICRO_VERSION.*[0-9]$' | \ - sed -e 's/#define XML_MICRO_VERSION.//'` - - EXPAT_VERSION="$expat_major.$expat_minor.$expat_revision" - AC_SUBST([EXPAT_VERSION]) - - dnl Decompose required version string and calculate numerical representation - expat_version_req_major=`expr $expat_version_req : '\([[0-9]]*\)'` - expat_version_req_minor=`expr $expat_version_req : '[[0-9]]*\.\([[0-9]]*\)'` - expat_version_req_revision=`expr $expat_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$expat_version_req_revision" = "x"; then - expat_version_req_revision="0" - fi - - expat_version_req_number=`expr $expat_version_req_major \* 10000 \ - \+ $expat_version_req_minor \* 100 \ - \+ $expat_version_req_revision` - - dnl Calculate numerical representation of detected version - expat_version_number=`expr $expat_major \* 10000 \ - \+ $expat_minor \* 100 \ - \+ $expat_revision` - - expat_version_check=`expr $expat_version_number \>\= $expat_version_req_number` - if test "$expat_version_check" = "1"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_WARN([Found Expat XML Parser $EXPAT_VERSION, which is older than required. Possible compilation failure.]) - fi - else - AC_MSG_RESULT([no]) - AC_MSG_WARN([Missing expat.h header. Unable to determine Expat version.]) - fi - fi - fi - - else - HAVE_EXPAT="no" - AC_MSG_RESULT([$HAVE_EXPAT]) - - if test "$expat_requested" = "yes"; then - AC_MSG_WARN([Expat XML Parser support requested but headers or library not found. Specify valid prefix of Expat using --with-expat=@<:@DIR@:>@ or provide include directory and linker flags using --with-expat-inc and --with-expat-lib]) - fi - fi -]) diff --git a/autoconf/ax_libxml2.m4 b/autoconf/ax_libxml2.m4 deleted file mode 100644 index f9e9d4e..0000000 --- a/autoconf/ax_libxml2.m4 +++ /dev/null @@ -1,28 +0,0 @@ -# Author: Remko Tronçon - -AC_DEFUN([AX_LIBXML], -[ - AC_ARG_WITH( - [libxml], - AC_HELP_STRING([--with-libxml=@<:@ARG@:>@],[Path to LibXML installation]), - [ - WITH_LIBXML="$withval" - if test "$withval" != "no" -a "$withval" != "yes"; then - LIBXML_CPPFLAGS="-I$withval/include/libxml2" - LIBXML_LDFLAGS="-L$withval/lib" - CPPFLAGS="$CPPFLAGS $LIBXML_CPPFLAGS" - LDFLAGS="$LDFLAGS $LIBXML_LDFLAGS" - fi - ], - [WITH_LIBXML="yes"]) - - if test "$WITH_LIBXML" != "no"; then - AC_CHECK_HEADER(libxml/parser.h, - [ - HAVE_LIBXML=yes - # TODO: Check if this lib exists - LIBXML_LIBS="-lxml2" - ], - []) - fi -]) diff --git a/autoconf/ax_openssl.m4 b/autoconf/ax_openssl.m4 deleted file mode 100644 index 0534e33..0000000 --- a/autoconf/ax_openssl.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# Author: Remko Tronçon - -AC_DEFUN([AX_OPENSSL], -[ - AC_ARG_WITH( - [openssl], - AC_HELP_STRING([--with-openssl=@<:@ARG@:>@],[Path to OpenSSL installation]), - [ - WITH_OPENSSL="$withval" - if test "$withval" != "no" -a "$withval" != "yes"; then - OPENSSL_CPPFLAGS="-I$withval/include" - case $host in - *-*-cygwin*|*-mingw32*) - OPENSSL_LIBS="-L$withval/lib/VC -leay32MT $withval/lib/VC/ssleay32MT.lib" - ;; - *) - OPENSSL_LIBS="-L$withval/lib -lssl -lcrypto" - esac - CPPFLAGS="$CPPFLAGS $OPENSSL_CPPFLAGS" - LDFLAGS="$LDFLAGS $OPENSSL_LIBS" - fi - ], - [ - WITH_OPENSSL="yes" - case $host in - *-*-cygwin*|*-mingw32*) - AC_MSG_ERROR([--with-openssl parameter is required on Windows]) - ;; - *) - OPENSSL_LIBS="-lssl -lcrypto" - esac - ]) - - if test "$WITH_OPENSSL" != "no"; then - AC_CHECK_HEADER(openssl/ssl.h, [HAVE_OPENSSL=yes], []) - fi -]) diff --git a/autoconf/ax_qt.m4 b/autoconf/ax_qt.m4 deleted file mode 100644 index 6b55c13..0000000 --- a/autoconf/ax_qt.m4 +++ /dev/null @@ -1,27 +0,0 @@ -# Author: Remko Tronçon - -AC_DEFUN([AX_QT], -[ - AC_ARG_WITH( - [qt], - AC_HELP_STRING([--with-qt=@<:@ARG@:>@],[Path to Qt installation]), - [ - WITH_QT="$withval" - if test "$withval" != "no" -a "$withval" != "yes"; then - QT_PATH="$withval/bin" - else - QT_PATH="$PATH" - fi - ], - [ - WITH_QT="yes" - QT_PATH="$PATH" - ]) - - if test "$WITH_QT" != "no"; then - AC_PATH_PROG(QMAKE, qmake, [], $QT_PATH) - if test "$QMAKE"; then - HAVE_QT=yes - fi - fi -]) diff --git a/autoconf/cccl b/autoconf/cccl deleted file mode 100755 index 8cb2866..0000000 --- a/autoconf/cccl +++ /dev/null @@ -1,199 +0,0 @@ -#!/bin/sh - -# cccl -# Wrapper around MS's cl.exe and link.exe to make them act more like -# Unix cc and ld -# -# Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org) -# -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# - -usage() -{ - cat <. -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/autoconf/config.sub b/autoconf/config.sub deleted file mode 100755 index c060f44..0000000 --- a/autoconf/config.sub +++ /dev/null @@ -1,1626 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. - -timestamp='2007-04-29' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file 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 Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/autoconf/install-sh b/autoconf/install-sh deleted file mode 100755 index a5897de..0000000 --- a/autoconf/install-sh +++ /dev/null @@ -1,519 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2006-12-25.00 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/configure.in b/configure.in deleted file mode 100644 index 80e69c0..0000000 --- a/configure.in +++ /dev/null @@ -1,269 +0,0 @@ -AC_PREREQ(2.57) -AC_INIT(Swift,[],swift@swift.im) -AC_CONFIG_SRCDIR([Swiften/Base/String.h]) -AC_CONFIG_AUX_DIR([autoconf]) -AC_CONFIG_HEADERS([Swiften/config.h]) -AC_CANONICAL_BUILD -AC_CANONICAL_HOST - -################################################################################ -# Config.h templates -################################################################################ - -AH_TEMPLATE(HAVE_OPENSSL, [OpenSSL library available]) -AH_TEMPLATE(HAVE_LIBXML, [LibXML library available]) -AH_TEMPLATE(HAVE_EXPAT, [Expat library available]) -AH_TEMPLATE(HAVE_BONJOUR, [Apple Bonjour SDK available]) -AH_TEMPLATE(HAVE_AVAHI, [Avahi library available]) - -################################################################################ -# Default flags -################################################################################ - -# Following flags generate too much warnings (in boost etc.). Make -# a configure option for these, and add a filter script -# -Weff-c++ -Wshadow -Winline -Wunreachable-code -# -ansi: Gets us into problems on MingW -CONFIG_CXXFLAGS="$CPPFLAGS -DHAVE_SWIFTEN_CONFIG_H $CXXFLAGS" -CONFIG_CFLAGS="$CPPFLAGS -DHAVE_SWIFTEN_CONFIG_H $CFLAGS" -CONFIG_LDFLAGS="$LDFLAGS" -CONFIG_LIBS="" - -case $host in - *-*-cygwin*) - CONFIG_CFLAGS="$CONFIG_CFLAGS -mno-cygwin" - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS -mno-cygwin" - CONFIG_LIBS="$CONFIG_LIBS -ldnsapi -lws2_32 -lwsock32" - CONFIG_WIN32=1 - ;; - *-mingw32*) - CONFIG_LIBS="$CONFIG_LIBS -ldnsapi -lws2_32 -lwsock32" - CONFIG_WIN32=1 - ;; - *-*-darwin*) - CONFIG_LIBS="$CONFIG_LIBS -lstdc++ -framework AppKit" - CONFIG_MACOSX=1 - ;; - *) - CONFIG_LIBS="$CONFIG_LIBS -lstdc++" -esac - -case $host in - x86_64-*) - ARCH="amd64" - ;; - i686-*) - ARCH="i686" - ;; - *) - ARCH="i386" -esac - -AC_CHECK_FILE([Swift/Makefile.inc], [BUILD_SWIFT="yes"], [BUILD_SWIFT="no"]) -AC_CHECK_FILE([Limber/Makefile.inc], [BUILD_LIMBER="yes"], [BUILD_LIMBER="no"]) -AC_CHECK_FILE([Slimber/Makefile.inc], [BUILD_SLIMBER="yes"], [BUILD_SLIMBER="no"]) - -################################################################################ -# Configure options -################################################################################ - -AC_ARG_ENABLE(debug, - AC_HELP_STRING(--enable-debug, [Build with debugging information (default: no)]), - [if test "$enableval" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS -g" - CONFIG_CFLAGS="$CONFIG_CFLAGS -g" - fi], - []) - -AC_ARG_ENABLE(optimize, - AC_HELP_STRING(--enable-optimize, [Optimize build (default: no)]), - [if test "$enableval" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS -O2" - CONFIG_CFLAGS="$CONFIG_CFLAGS -O2" - fi], - []) - -AC_ARG_ENABLE(coverage, - AC_HELP_STRING(--enable-coverage, [Enable coverage (default: no)]), - [if test "$enableval" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS -fprofile-arcs -ftest-coverage" - CONFIG_LDFLAGS="$CONFIG_LDFLAGS -fprofile-arcs -ftest-coverage" - fi], - []) - -AC_ARG_ENABLE(universal, - AC_HELP_STRING(--enable-universal, [Enable universal builds (default: no)]), - [if test "$enableval" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - CONFIG_CFLAGS="$CONFIG_CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - CONFIG_LDFLAGS="$CONFIG_LDFLAGS -mmacosx-version-min=10.4 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - LDFLAGS="$LDFLAGS -mmacosx-version-min=10.4 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - fi], - []) - -AC_ARG_ENABLE(gcc-warnings, - AC_HELP_STRING(--disable-gcc-warnings, [Disable GCC compiler warnings (default: no)]), - [enable_gcc_warnings="$enableval"], - [enable_gcc_warnings="yes"]) - -if test "$enable_gcc_warnings" != "no"; then - #CONFIG_CFLAGS="$CONFIG_CFLAGS -W -Wall -Wredundant-decls -pedantic -Wno-long-long -Wundef -Wfloat-equal" - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS -W -Wall -Wredundant-decls -pedantic -Wno-long-long -Woverloaded-virtual -Wundef -Wfloat-equal -Wold-style-cast" - CONFIG_LDFLAGS="$CONFIG_LDFLAGS -W -Wall" -fi - -################################################################################ -# Checks for programs and sets default compiler options. -################################################################################ - -# On windows, use some smart defaults for the compiler -case $host in - *-*-cygwin* | *-mingw32*) - if test -z "$CC"; then - CC="autoconf/cccl" - fi - if test -z "$CXX"; then - CXX="autoconf/cccl" - fi - if test -z "$MM"; then - MM="gcc" - fi - ;; - *) -esac - -AC_PROG_CC -AC_PROG_CXX -AC_GNU_SOURCE -AC_PROG_MAKE_SET -AC_PROG_INSTALL -#AC_SYS_LARGEFILE -CONFIG_CC="$CC" -CONFIG_CXX="$CXX" -if test -z "$MM"; then - MM="$CC" -fi - -# Qt -if test "$BUILD_SWIFT" == "yes"; then - NEED_QT=yes -fi -if test "$NEED_QT" == "yes"; then - AX_QT() - if test "$HAVE_QT" != yes; then - AC_MSG_ERROR([Could not find Qt]) - fi -fi - -# Expat -AX_LIB_EXPAT() -if test "$HAVE_EXPAT" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS $EXPAT_CFLAGS" - CONFIG_LDFLAGS="$CONFIG_LDFLAGS $EXPAT_LDFLAGS" - AC_DEFINE(HAVE_EXPAT) -fi - -# LibXML -AX_LIBXML() -CONFIG_HAVE_LIBXML="$HAVE_LIBXML" -if test "$HAVE_LIBXML" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS $LIBXML_CPPFLAGS" - CONFIG_LDFLAGS="$CONFIG_LDFLAGS $LIBXML_LDFLAGS" - CONFIG_LIBS="$LIBXML_LIBS $CONFIG_LIBS" - AC_DEFINE(HAVE_LIBXML) -fi - -# Test whether we have *a* parser, and use bundled Expat if necessary -if test "$HAVE_EXPAT" != yes -a "$HAVE_LIBXML" != yes; then - AC_MSG_NOTICE([No installed XML parser found. Using bundled Expat]) - HAVE_EXPAT=yes - USE_BUNDLED_EXPAT=yes -fi - -# OpenSSL -AX_OPENSSL() -CONFIG_HAVE_OPENSSL="$HAVE_OPENSSL" -if test "$HAVE_OPENSSL" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS $OPENSSL_CPPFLAGS" - CONFIG_CFLAGS="$CONFIG_CFLAGS $OPENSSL_CPPFLAGS" - CONFIG_LIBS="$CONFIG_LIBS $OPENSSL_LIBS" - AC_DEFINE(HAVE_OPENSSL) -fi - -# Resolv -AC_CHECK_LIB(resolv, inet_aton) - -# DNSSD Service -case $host in - *-*-cygwin*) - ;; - *-mingw32*) - ;; - *-*-darwin*) - HAVE_BONJOUR=yes - AC_DEFINE(HAVE_BONJOUR) - ;; - *) - AX_AVAHI() - if test "$HAVE_AVAHI" = yes; then - CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS $AVAHI_CPPFLAGS" - CONFIG_LDFLAGS="$CONFIG_LDFLAGS $AVAHI_LDFLAGS" - CONFIG_LIBS="$AVAHI_LIBS $CONFIG_LIBS" - AC_DEFINE(HAVE_AVAHI) - fi -esac - - -################################################################################ -# Build configuration summary -################################################################################ - -echo -echo " Build Configuration" -echo " -------------------" - -TEXT_XML_PARSERS= -if test "$HAVE_LIBXML" == "yes"; then TEXT_XML_PARSERS="LibXML"; fi -if test "$USE_BUNDLED_EXPAT" == "yes"; then TEXT_XML_PARSERS="(Bundled)"; fi -if test "$HAVE_EXPAT" == "yes"; then TEXT_XML_PARSERS="Expat $TEXT_XML_PARSERS"; fi -echo " XML Parser(s): $TEXT_XML_PARSERS" - -if test "$HAVE_OPENSSL" = yes; then TEXT_TLS_SUPPORT="OpenSSL"; fi -if test "$HAVE_OPENSSL" != yes; then TEXT_TLS_SUPPORT="Disabled"; fi -echo " TLS support: $TEXT_TLS_SUPPORT" -echo - -################################################################################ -# Generate files -################################################################################ - -AC_SUBST(SET_MAKE) -AC_SUBST(HAVE_EXPAT) -AC_SUBST(HAVE_AVAHI) -AC_SUBST(HAVE_BONJOUR) -AC_SUBST(CONFIG_CXX) -AC_SUBST(CONFIG_CXXFLAGS) -AC_SUBST(CONFIG_CC) -AC_SUBST(MM) -AC_SUBST(CONFIG_CFLAGS) -AC_SUBST(CONFIG_LDFLAGS) -AC_SUBST(CONFIG_LIBS) -AC_SUBST(LIBS) -AC_SUBST(CONFIG_WIN32) -AC_SUBST(CONFIG_MACOSX) -AC_SUBST(CONFIG_HAVE_OPENSSL) -AC_SUBST(USE_BUNDLED_EXPAT) -AC_SUBST(CONFIG_HAVE_LIBXML) -AC_SUBST(QMAKE) -AC_SUBST(BUILD_SWIFT) -AC_SUBST(BUILD_LIMBER) -AC_SUBST(BUILD_SLIMBER) -AC_SUBST(ARCH) - -AC_CONFIG_FILES([Makefile.config]) -if test "$BUILD_SWIFT" == "yes"; then - AC_CONFIG_FILES([Swift/QtUI/config.pri]) -fi -AC_OUTPUT -- cgit v0.10.2-6-g49f6