From: Alon Bar-L. <alo...@gm...> - 2012-02-29 20:22:52
|
Add: 1. automake 2. libtool 3. some minor modifications Signed-off-by: Alon Bar-Lev <alo...@gm...> --- .gitignore | 39 +- Makefile.am | 102 +++ Makefile.in | 57 -- OpenVPN GUI ReadMe.txt | 231 ------- README | 231 +++++++ acinclude.m4 | 87 --- bootstrap | 2 - build/ltrc.inc | 23 + config.guess | 1502 ------------------------------------------ config.sub | 1714 ------------------------------------------------ configure.ac | 107 ++-- localization.c | 5 +- main.c | 10 +- manage.c | 5 + manage.h | 2 + openvpn.c | 5 +- openvpn_config.c | 5 +- options.c | 7 +- passphrase.c | 5 +- proxy.c | 6 +- registry.c | 4 +- res/openvpn-gui-res.rc | 11 +- scripts.c | 5 +- service.c | 5 +- tray.c | 5 +- viewlog.c | 5 +- 26 files changed, 515 insertions(+), 3665 deletions(-) create mode 100644 Makefile.am delete mode 100644 Makefile.in delete mode 100644 OpenVPN GUI ReadMe.txt create mode 100644 README delete mode 100644 acinclude.m4 delete mode 100755 bootstrap create mode 100644 build/ltrc.inc delete mode 100755 config.guess delete mode 100755 config.sub create mode 100644 m4/.keep diff --git a/.gitignore b/.gitignore index b20233e..13398ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,38 @@ +*.[oa] +*.dll +*.exe +*.exe.* +*.obj +*.pyc +*.so +*~ +*.idb +*.suo +*.ncb +*.vcproj.* +*.log + +.deps Makefile +Makefile.in aclocal.m4 -autom4te.cache/ -config.h* +autodefs.h +autom4te.cache +config.guess +config.h +config.h.in config.log config.status +config.sub configure -*.tar.gz -*.o -*.exe -*~ +configure.h +depcomp +stamp-h1 +install-sh +missing +ltmain.sh +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..31c2343 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,102 @@ +# OpenVPN-GUI -- A Windows GUI for OpenVPN. +# +# Copyright (C) 2004 Mathias Sundman <ma...@ni...> +# 2010 Heiko Hund <he...@us...> +# +# 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 (see the file COPYING included with this +# distribution); if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +include $(top_srcdir)/build/ltrc.inc + +# windres must of #include of .rc +# we cannot put this in SOURCES +extra_res = \ + res/openvpn-gui-res-de.rc \ + res/openvpn-gui-res-dk.rc \ + res/openvpn-gui-res-en.rc \ + res/openvpn-gui-res-es.rc \ + res/openvpn-gui-res-fi.rc \ + res/openvpn-gui-res-fr.rc \ + res/openvpn-gui-res-it.rc \ + res/openvpn-gui-res-jp.rc \ + res/openvpn-gui-res-nl.rc \ + res/openvpn-gui-res-no.rc \ + res/openvpn-gui-res-pl.rc \ + res/openvpn-gui-res-pt.rc \ + res/openvpn-gui-res-se.rc \ + res/openvpn-gui-res-tr.rc \ + res/connected.ico \ + res/connecting.ico \ + res/disconnected.ico \ + res/openvpn-gui.ico \ + res/reconnecting.ico \ + res/openvpn-gui.manifest + + +AUTOMAKE_OPTIONS = foreign 1.9 +ACLOCAL_AMFLAGS = -I m4 + +MAINTAINERCLEANFILES = \ + config.log config.status \ + $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \ + $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \ + $(srcdir)/m4/libtool.m4 $(srcdir)/m4/lt~obsolete.m4 \ + $(srcdir)/m4/ltoptions.m4 $(srcdir)/m4/ltsugar.m4 \ + $(srcdir)/m4/ltversion.m4 \ + $(srcdir)/depcomp $(srcdir)/aclocal.m4 \ + $(srcdir)/config.guess $(srcdir)/config.sub + +EXTRA_DIST = $(extra_res) + +bin_PROGRAMS = openvpn-gui + +dist_doc_DATA = \ + COPYRIGHT.GPL \ + COPYING + +dist_noinst_DATA = \ + .gitignore + +INCLUDES = $(OPENSSL_CRYPTO_CFLAGS) +AM_CPPFLAGS = -D_UNICODE +AM_CFLAGS = -municode + +openvpn_gui_SOURCES = \ + main.c main.h \ + openvpn.c openvpn.h \ + localization.c localization.h \ + tray.c tray.h \ + viewlog.c viewlog.h \ + service.c service.h \ + options.c options.h \ + passphrase.c passphrase.h \ + proxy.c proxy.h \ + registry.c registry.h \ + scripts.c scripts.h \ + manage.c manage.h \ + openvpn_config.c \ + openvpn_config.h \ + chartable.h openvpn-gui-res.h \ + res/openvpn-gui-res.rc +openvpn_gui_LDADD = \ + $(OPENSSL_CRYPTO_LIBS) \ + -lws2_32 \ + -lcomctl32 +openvpn_gui_LDFLAGS = \ + -mwindows + +$(srcdir)/res/openvpn-gui-res.rc: $(extra_res) + touch "$(srcdir)/res/openvpn-gui-res.rc" diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 4ab1317..0000000 --- a/Makefile.in +++ /dev/null @@ -1,57 +0,0 @@ -SNAPSHOT = $(shell test -f SNAPSHOT && cat SNAPSHOT) -VERSION = @PACKAGE_VERSION@$(SNAPSHOT) -EXE = @PACKAGE_TARNAME@$(SNAPSHOT).exe - -CC = @CC@ -WINDRES = @WINDRES@ - -LDFLAGS = @CRYPTO_LDFLAGS@ @LDFLAGS@ -LIBS = @CRYPTO_LIBS@ @LIBS@ -CFLAGS = @CRYPTO_CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ -DUNICODE -D_UNICODE -CFLAGS += -W -Wall -Wno-unused-parameter -pedantic - -OBJS = main.o tray.o openvpn.o viewlog.o \ - service.o options.o passphrase.o proxy.o registry.o manage.o \ - openvpn_config.o scripts.o localization.o openvpn-gui-res.o - -SOURCES = main.c main.h openvpn.c openvpn.h localization.c localization.h \ - tray.c tray.h viewlog.c viewlog.h service.c service.h \ - options.c options.h passphrase.c passphrase.h proxy.c proxy.h \ - registry.c registry.h scripts.c scripts.h manage.c manage.h \ - openvpn_config.c openvpn_config.h res/openvpn-gui.manifest \ - chartable.h openvpn-gui-res.h res/openvpn-gui-res*.rc - -EXTRA = res/*.ico acinclude.m4 Makefile.in aclocal.m4 config.h.in configure \ - configure.ac config.guess config.sub install-sh \ - OpenVPN\ GUI\ ReadMe.txt changes.txt COPYING COPYRIGHT.GPL - -all : ${OBJS} - ${CC} $(CFLAGS) $(LDFLAGS) -o $(EXE) ${OBJS} ${LIBS} - -%.o : %.c %.h - $(CC) $(CFLAGS) -c $< - -openvpn-gui-res.o : openvpn-gui-res.h res/*.rc res/*.ico res/*.manifest - $(WINDRES) -I. -i res/openvpn-gui-res.rc -o openvpn-gui-res.o - -dist: - rm -rf @PACKAGE_TARNAME@-*/ - mkdir @PACKAGE_TARNAME@-$(VERSION) - cp --parents $(SOURCES) $(EXTRA) @PACKAGE_TARNAME@-$(VERSION) - test ! -f SNAPSHOT || { \ - cd openvpn-gui-$(VERSION); \ - cp ../SNAPSHOT .; \ - sed -i -e 's/\[MAJOR_VERSION.MINOR_VERSION.RELEASE\]/[$(subst -,,$(SNAPSHOT))]/' configure.ac; \ - autoconf; \ - cd -; \ - } - tar -czf @PACKAGE_TARNAME@-$(VERSION).tar.gz @PACKAGE_TARNAME@-$(VERSION) - rm -rf @PACKAGE_TARNAME@-$(VERSION) - -snapshot: - echo "-`date +%Y%m%d%H%M%S`" > SNAPSHOT - $(MAKE) dist - rm -f SNAPSHOT - -clean : - rm -f *.o *.exe diff --git a/OpenVPN GUI ReadMe.txt b/OpenVPN GUI ReadMe.txt deleted file mode 100644 index 323361b..0000000 --- a/OpenVPN GUI ReadMe.txt +++ /dev/null @@ -1,231 +0,0 @@ -Installation Instructions for OpenVPN GUI for Windows ------------------------------------------------------ - -You can either get my installation package for OpenVPN 2.0.X where I've -bundled the gui in the installation package, or you can use the original -installation package from OpenVPN, and then manually install OpenVPN GUI. - - -Installation using the bundled OpenVPN package with OpenVPN GUI included ------------------------------------------------------------------------- - -* Download openvpn-2.0.X-gui-1.0.X-install.exe from - http://openvpn.se - -* If you have a previous version of OpenVPN GUI installed, shut it down. - Make sure it's closed by ALL logged on users. - -* Run the install program. During the installation you can choose if the GUI - should be started automatically at system startup. The default is yes. - -* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: - C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" - options as OpenVPN GUI redirect the normal output to a log file itself. - There is a sample config files in the "sample-config" folder. Please - refer to the OpenVPN project homepage for more information regarding - creating the configuration file. http://openvpn.net/ - - -Manual installation of OpenVPN GUI ----------------------------------- - -* Download and install OpenVPN from http://openvpn.net/ - -* Download openvpn-gui-1.0.X.exe and save it in OpenVPN's bin folder. - Default is "C:\Program Files\OpenVPN\bin\". You must put it in this folder - because OpenVPN GUI depends on the OpenSSL DLLs installed in this folder by - OpenVPN. - -* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: - C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" - options as OpenVPN GUI redirect the normal output to a log file itself. - There is a sample config files in the "sample-config" folder. Please - refer to the OpenVPN project homepage for more information regarding - creating the configuration file. http://openvpn.net/ - -* Put a short-cut to openvpn-gui-1.0-X.exe in your - "Start->All Program->StartUp" folder if you want the gui started automatically - when you logon to Windows. - -* Start the GUI by double-clicking the openvpn-gui-1.0.X.exe file. - -*** You need to be Administrator the first time you run OpenVPN GUI for it to - create its registry keys. After that you don't have to be administrator - just to run the GUI, however OpenVPN requires the user to be - administrator to run! *** - - -Using OpenVPN GUI ------------------ - -When OpenVPN GUI is started your config folder (C:\Program Files\OpenVPN\config) -will be scanned for .ovpn files, and an icon will be displayed in the taskbar's -status area. - -If you do not have any openvpn connection running, the config dir will be -re-scanned for new config files every time you open the OpenVPN GUI menu by -right-clicking the icon. - -When you choose to connect to a site OpenVPN GUI will launch openvpn with -the specified config file. If you use a passphrase protected key you will be -prompted for the passphrase. - -If you want OpenVPN GUI to start a connection automatically when it's started, -you can use the --connect cmd-line option. You have to include the extention -for the config file. Example: - -openvpn-gui --connect office.ovpn - - -Run OpenVPN GUI as a Non-Admin user ------------------------------------ - -OpenVPN currently does not work as a normal (non-admin) user. OpenVPN GUI -2.0 will solve this by using an enhanced version of the OpenVPN service -to start and stop openvpn processes. - -In the mean time, it is possible to use OpenVPN GUI to control the current -OpenVPN Service to start and stop a connection. - -To use OpenVPN GUI to control the OpenVPN service, set the registry value -"service_only" to '1'. See the section about registry values below. - -Limitations with this way: - - There is no way for OpenVPN GUI ta hand over a password to the service - wrapper, so you can't use passphrase protected private keys or - username/password authentication. - - If you have multiple openvpn configurations, all will be started and - stopped at the same time. - - OpenVPN GUI is not able to retrieve any status info about the connections - from OpenVPN, so it will report connected as soon as the service is - started regarless of if OpenVPN has really succeded to connect or not. - - You cannot see the OpenVPN log in real-time. - - -Run Connect/Disconnect/Preconnect Scripts ------------------------------------------ - -There are three diffrent scripts that OpenVPN GUI can execute to help -with diffrent tasks like mapping network drives. - -Preconnect If a file named "xxx_pre.bat" exist in the config folder - where xxx is the same as your OpenVPN config file name, - this will be executed BEFORE the OpenVPN tunnel is established. - -Connect If a file named "xxx_up.bat" exist in the config folder - where xxx is the same as your OpenVPN config file name, - this will be executed AFTER the OpenVPN tunnel is established. - -Disconnect If a file named "xxx_down.bat" exist in the config folder - where xxx is the same as your OpenVPN config file name, - this will be executed BEFORE the OpenVPN tunnel is closed. - - -Registry Values affecting the OpenVPN GUI operation ---------------------------------------------------- - -All OpenVPN GUI reg-values are located below the following key: -HKEY_LOCAL_MACHINE\SOFTWARE\OpenVPN-GUI\ - -The follow keys are used to control the OpenVPN GUI - -config_dir - configuration file directory, defaults to "C:\Program Files\OpenVPN\config" - -config_ext - file extension on configuration files, defaults to "ovpn" - -connectscript_timeout - Time in seconds to wait for the connect script to finish. If set to 0 - the exitcode of the script is not checked. - -disconnectscript_timeout - Time in seconds to wait for the disconnect script to finish. Must be a - value between 1-99. - -preconnectscript_timeout - Time in seconds to wait for the preconnect script to finish. Must be a - value between 1-99. - -exe_path - path to openvpn.exe, defaults to "C:\Program Files\OpenVPN\bin\openvpn.exe" - -log_dir - log file directory, defaults to "C:\Program Files\OpenVPN\log" - -log_append - if set to "0", the log file will be truncated every time you start a - connection. If set to "1", the log will be appended to the log file. - -priority - the windows priority class for each instantiated OpenVPN process, - can be one of: - - * "IDLE_PRIORITY_CLASS" - * "BELOW_NORMAL_PRIORITY_CLASS" - * "NORMAL_PRIORITY_CLASS" (default) - * "ABOVE_NORMAL_PRIORITY_CLASS" - * "HIGH_PRIORITY_CLASS" - -allow_edit - If set to "1", the Edit config menu will be showed. - -allow_password - If set to "1", the Change Password menu will be showed. - -allow_proxy - If set to "1", the Proxy Settings menu will be showed. - -allow_service - If set to "1", the Service control menu will be showed. - -silent_connection - If set to "1", the status window with the OpenVPN log output will - not be showed while connecting. - -service_only - If set to "1", OpenVPN GUI's normal "Connect" and "Disconnect" - actions are changed so they start/stop the OpenVPN service instead - of launching openvpn.exe directly. - -show_balloon - If set to "0" - Never show any connected balloon. - "1" - Show balloon after initial connection is established. - "2" - Show balloon even after re-connects. -log_viewer - The program used to view your log files, defaults to - "C:\windows\notepad.exe" - -editor - The program used to edit your config files, defaults to - "C:\windows\notepad.exe" - -passphrase_attempts - Number of attempts to enter the passphrase to allow. - -All these registry options is also available as cmd-line options. -Use "openvpn-gui --help" for more info about cmd-line options. - - -If you have any problem getting OpenVPN GUI to work you can reach me via -email at ma...@ni.... - - -Building OpenVPN GUI from source --------------------------------- - -* Download and install MinGW and MSYS from http://www.mingw.org/ - I'm using MinGW-3.2.0-rc-3 and MSYS-1.0.10. - -* Download and install the binary distribution of OpenSSL from - http://www.slproweb.com/products/Win32OpenSSL.html - -* Download and extract the OpenVPN GUI source archive. - -* Start a bash shell by running msys.bat. - -* Run "make" from the OpenVPN GUI source directory. diff --git a/README b/README new file mode 100644 index 0000000..323361b --- /dev/null +++ b/README @@ -0,0 +1,231 @@ +Installation Instructions for OpenVPN GUI for Windows +----------------------------------------------------- + +You can either get my installation package for OpenVPN 2.0.X where I've +bundled the gui in the installation package, or you can use the original +installation package from OpenVPN, and then manually install OpenVPN GUI. + + +Installation using the bundled OpenVPN package with OpenVPN GUI included +------------------------------------------------------------------------ + +* Download openvpn-2.0.X-gui-1.0.X-install.exe from + http://openvpn.se + +* If you have a previous version of OpenVPN GUI installed, shut it down. + Make sure it's closed by ALL logged on users. + +* Run the install program. During the installation you can choose if the GUI + should be started automatically at system startup. The default is yes. + +* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: + C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" + options as OpenVPN GUI redirect the normal output to a log file itself. + There is a sample config files in the "sample-config" folder. Please + refer to the OpenVPN project homepage for more information regarding + creating the configuration file. http://openvpn.net/ + + +Manual installation of OpenVPN GUI +---------------------------------- + +* Download and install OpenVPN from http://openvpn.net/ + +* Download openvpn-gui-1.0.X.exe and save it in OpenVPN's bin folder. + Default is "C:\Program Files\OpenVPN\bin\". You must put it in this folder + because OpenVPN GUI depends on the OpenSSL DLLs installed in this folder by + OpenVPN. + +* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: + C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" + options as OpenVPN GUI redirect the normal output to a log file itself. + There is a sample config files in the "sample-config" folder. Please + refer to the OpenVPN project homepage for more information regarding + creating the configuration file. http://openvpn.net/ + +* Put a short-cut to openvpn-gui-1.0-X.exe in your + "Start->All Program->StartUp" folder if you want the gui started automatically + when you logon to Windows. + +* Start the GUI by double-clicking the openvpn-gui-1.0.X.exe file. + +*** You need to be Administrator the first time you run OpenVPN GUI for it to + create its registry keys. After that you don't have to be administrator + just to run the GUI, however OpenVPN requires the user to be + administrator to run! *** + + +Using OpenVPN GUI +----------------- + +When OpenVPN GUI is started your config folder (C:\Program Files\OpenVPN\config) +will be scanned for .ovpn files, and an icon will be displayed in the taskbar's +status area. + +If you do not have any openvpn connection running, the config dir will be +re-scanned for new config files every time you open the OpenVPN GUI menu by +right-clicking the icon. + +When you choose to connect to a site OpenVPN GUI will launch openvpn with +the specified config file. If you use a passphrase protected key you will be +prompted for the passphrase. + +If you want OpenVPN GUI to start a connection automatically when it's started, +you can use the --connect cmd-line option. You have to include the extention +for the config file. Example: + +openvpn-gui --connect office.ovpn + + +Run OpenVPN GUI as a Non-Admin user +----------------------------------- + +OpenVPN currently does not work as a normal (non-admin) user. OpenVPN GUI +2.0 will solve this by using an enhanced version of the OpenVPN service +to start and stop openvpn processes. + +In the mean time, it is possible to use OpenVPN GUI to control the current +OpenVPN Service to start and stop a connection. + +To use OpenVPN GUI to control the OpenVPN service, set the registry value +"service_only" to '1'. See the section about registry values below. + +Limitations with this way: + + There is no way for OpenVPN GUI ta hand over a password to the service + wrapper, so you can't use passphrase protected private keys or + username/password authentication. + + If you have multiple openvpn configurations, all will be started and + stopped at the same time. + + OpenVPN GUI is not able to retrieve any status info about the connections + from OpenVPN, so it will report connected as soon as the service is + started regarless of if OpenVPN has really succeded to connect or not. + + You cannot see the OpenVPN log in real-time. + + +Run Connect/Disconnect/Preconnect Scripts +----------------------------------------- + +There are three diffrent scripts that OpenVPN GUI can execute to help +with diffrent tasks like mapping network drives. + +Preconnect If a file named "xxx_pre.bat" exist in the config folder + where xxx is the same as your OpenVPN config file name, + this will be executed BEFORE the OpenVPN tunnel is established. + +Connect If a file named "xxx_up.bat" exist in the config folder + where xxx is the same as your OpenVPN config file name, + this will be executed AFTER the OpenVPN tunnel is established. + +Disconnect If a file named "xxx_down.bat" exist in the config folder + where xxx is the same as your OpenVPN config file name, + this will be executed BEFORE the OpenVPN tunnel is closed. + + +Registry Values affecting the OpenVPN GUI operation +--------------------------------------------------- + +All OpenVPN GUI reg-values are located below the following key: +HKEY_LOCAL_MACHINE\SOFTWARE\OpenVPN-GUI\ + +The follow keys are used to control the OpenVPN GUI + +config_dir + configuration file directory, defaults to "C:\Program Files\OpenVPN\config" + +config_ext + file extension on configuration files, defaults to "ovpn" + +connectscript_timeout + Time in seconds to wait for the connect script to finish. If set to 0 + the exitcode of the script is not checked. + +disconnectscript_timeout + Time in seconds to wait for the disconnect script to finish. Must be a + value between 1-99. + +preconnectscript_timeout + Time in seconds to wait for the preconnect script to finish. Must be a + value between 1-99. + +exe_path + path to openvpn.exe, defaults to "C:\Program Files\OpenVPN\bin\openvpn.exe" + +log_dir + log file directory, defaults to "C:\Program Files\OpenVPN\log" + +log_append + if set to "0", the log file will be truncated every time you start a + connection. If set to "1", the log will be appended to the log file. + +priority + the windows priority class for each instantiated OpenVPN process, + can be one of: + + * "IDLE_PRIORITY_CLASS" + * "BELOW_NORMAL_PRIORITY_CLASS" + * "NORMAL_PRIORITY_CLASS" (default) + * "ABOVE_NORMAL_PRIORITY_CLASS" + * "HIGH_PRIORITY_CLASS" + +allow_edit + If set to "1", the Edit config menu will be showed. + +allow_password + If set to "1", the Change Password menu will be showed. + +allow_proxy + If set to "1", the Proxy Settings menu will be showed. + +allow_service + If set to "1", the Service control menu will be showed. + +silent_connection + If set to "1", the status window with the OpenVPN log output will + not be showed while connecting. + +service_only + If set to "1", OpenVPN GUI's normal "Connect" and "Disconnect" + actions are changed so they start/stop the OpenVPN service instead + of launching openvpn.exe directly. + +show_balloon + If set to "0" - Never show any connected balloon. + "1" - Show balloon after initial connection is established. + "2" - Show balloon even after re-connects. +log_viewer + The program used to view your log files, defaults to + "C:\windows\notepad.exe" + +editor + The program used to edit your config files, defaults to + "C:\windows\notepad.exe" + +passphrase_attempts + Number of attempts to enter the passphrase to allow. + +All these registry options is also available as cmd-line options. +Use "openvpn-gui --help" for more info about cmd-line options. + + +If you have any problem getting OpenVPN GUI to work you can reach me via +email at ma...@ni.... + + +Building OpenVPN GUI from source +-------------------------------- + +* Download and install MinGW and MSYS from http://www.mingw.org/ + I'm using MinGW-3.2.0-rc-3 and MSYS-1.0.10. + +* Download and install the binary distribution of OpenSSL from + http://www.slproweb.com/products/Win32OpenSSL.html + +* Download and extract the OpenVPN GUI source archive. + +* Start a bash shell by running msys.bat. + +* Run "make" from the OpenVPN GUI source directory. diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 9150725..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,87 +0,0 @@ -AC_DEFUN([AX_ASSERT_LIB], [ - AC_CHECK_HEADER([$2], , [AC_MSG_FAILURE([$1 library headers could not be found.])], [$5]) - AC_MSG_CHECKING([if $1 library is available]) - LIBS="-l$1 $LIBS" - AC_TRY_LINK( - [$5 - #include <$2>], [$3], [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]); AC_MSG_FAILURE([$4])] - ) -]) - - -AC_DEFUN([AX_SEARCH_LIB], [ - _ldflags="$LDFLAGS" - _cppflags="$CPPFLAGS" - _libs="$LIBS" - - AC_ARG_WITH(m4_translit([$1], [_], [-]), - [AS_HELP_STRING([--with-]m4_translit([$1], [_], [-])[=DIR], - [search for $1 files in DIR/lib and DIR/include])], - [dnl - if test -d $withval - then - LDFLAGS="-L$withval/lib $_ldflags" - CPPFLAGS="-I$withval/include $_cppflags" - AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_LDFLAGS], [-L$withval/lib]) - AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_CPPFLAGS], [-I$withval/include]) - else - AC_MSG_ERROR([$withval: No such directory]) - fi - ] - ) - - AC_ARG_WITH(m4_translit([$1], [_], [-])[-lib], - [AS_HELP_STRING([--with-]m4_translit([$1], [_], [-])[-lib=DIR], - [search for $1 library in DIR])], - [dnl - if test -d $withval - then - LDFLAGS="-L$withval $_ldflags" - AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_LDFLAGS], [-L$withval]) - else - AC_MSG_ERROR([$withval: No such directory]) - fi - ] - ) - - AC_ARG_WITH(m4_translit([$1], [_], [-])[-includes], - [AS_HELP_STRING([--with-]m4_translit([$1], [_], [-])[-includes=DIR], - [search for $1 library header files in DIR])], - [dnl - if test -d $withval - then - CPPFLAGS="-I$withval $_cppflags" - AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_CPPFLAGS], [-I$withval]) - else - AC_MSG_ERROR([$withval: No such directory]) - fi - ] - ) - - AC_CHECK_HEADER([$4], , [AC_MSG_FAILURE([$1 library headers could not be found. You may want to specify a search path using `--with-]m4_translit([$1], [_], [-])[-includes'.])]) - - _result=no - for lib in $1 $2; do - AC_MSG_CHECKING([if $lib library is available]) - LIBS="-l$lib $3 $_libs" - AC_TRY_LINK([#include <$4>], [$5], [ - AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_LIBS], [-l$lib]) - AC_MSG_RESULT([yes]) - _result=yes - break - ], [AC_MSG_RESULT([no])]) - done - if test "$_result" = "no"; then - AC_MSG_FAILURE([$1 library could not be found. You may want to specify a search path using `--with-]m4_translit([$1], [_], [-])[[[-lib]]'.]) - fi - - CPPFLAGS="$_cppflags" - LDFLAGS="$_ldflags" - LIBS="$_libs" - - _result= - _cppflags= - _ldflags= - _libs= -]) \ No newline at end of file diff --git a/bootstrap b/bootstrap deleted file mode 100755 index c083272..0000000 --- a/bootstrap +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -autoreconf diff --git a/build/ltrc.inc b/build/ltrc.inc new file mode 100644 index 0000000..701f200 --- /dev/null +++ b/build/ltrc.inc @@ -0,0 +1,23 @@ +# +# OpenVPN -- An application to securely tunnel IP networks +# over a single UDP port, with support for SSL/TLS-based +# session authentication and key exchange, +# packet encryption, packet authentication, and +# packet compression. +# +# Copyright (C) 2008-2012 Alon Bar-Lev <alo...@gm...> +# +# Required to build Windows resource file + +RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) +LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE) + +.rc.lo: + $(LTRCCOMPILE) -i "$<" -o "$@" + +.rc.o: + $(RCCOMPILE) -i "$<" -o "$@" + +.mc.rc: + $(WINDMC) "$<" diff --git a/config.guess b/config.guess deleted file mode 100755 index c2246a4..0000000 --- a/config.guess +++ /dev/null @@ -1,1502 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. - -timestamp='2009-12-30' - -# 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <con...@gn...> and include a 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. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - -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 <con...@gn...>." - -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, 2006, 2007, 2008, 2009, 2010 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. -# (gh...@no... 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 -q __ELF__ - 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*:*:*) - # ak...@wp... (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 ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - 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:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-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 <stdio.h> /* 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 <sys/systemcfg.h> - - 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:*:[456]) - 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 <stdlib.h> - #include <unistd.h> - - 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 -q __LP64__ - 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 <unistd.h> - 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*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-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 ;; - 8664:Windows_NT:*) - echo x86_64-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 ;; - 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 -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - 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 ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - 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:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - 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 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-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 ${UNAME_MACHINE}-unknown-linux-gnu - 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... [truncated message content] |