Rework the README and INSTALL files. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>pull/8/head
parent
350c369a73
commit
b353103ec0
@ -1,3 +0,0 @@
|
|||||||
[submodule "admin"]
|
|
||||||
path = admin
|
|
||||||
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
|
|
@ -1,229 +1,24 @@
|
|||||||
Before Compiling
|
|
||||||
----------------
|
|
||||||
To compile TorK you will need to have a number of specific packages installed. The
|
|
||||||
actual name of these packages will vary according to your distribution. These packages
|
|
||||||
will not only enable you to compile TorK but pretty much any GNU/Linux application
|
|
||||||
from source.
|
|
||||||
|
|
||||||
If you have the disk space, I recommend just installing every package that has either
|
|
||||||
'lib' or 'dev' in the title. This will save you no end of bother now and in the future.
|
|
||||||
|
|
||||||
If you want to be selective, the list below provides guidance on the keywords to search
|
|
||||||
for on your installation CD or vendor package repository. The list below is an absolute
|
|
||||||
minimum. Your vendor may use the term 'devel' or even 'lib' instead of 'dev' in the list
|
|
||||||
below.
|
|
||||||
|
|
||||||
- gcc (c compiler)
|
|
||||||
- glibc-dev
|
|
||||||
- gcc-c++ (c++ compiler)
|
|
||||||
- libstdc++-dev (c++ standard library)
|
|
||||||
- make (compilation manager)
|
|
||||||
- automake, autoconf (compilation toolchain)
|
|
||||||
- libgtk+-dev, libglib-dev (gnome libraries)
|
|
||||||
- libgr-dev, libungif-dev, libjpeg-dev, libpng-dev, libtiff-dev, libxpm-dev (image libraries)
|
|
||||||
- XFree86-dev (necessary for graphics programs)
|
|
||||||
- zlib-dev (compression)
|
|
||||||
- libtqt or libtqt-dev or qt-dev (QT development libraries)
|
|
||||||
- openssl
|
|
||||||
- Any package with kde and dev in the title.
|
|
||||||
- Any package with kde and lib in the title.
|
|
||||||
|
|
||||||
|
|
||||||
Compiling
|
|
||||||
---------
|
|
||||||
|
|
||||||
To compile:
|
|
||||||
./configure
|
|
||||||
make
|
|
||||||
su -c 'make install'
|
|
||||||
|
|
||||||
To compile and install from CVS:
|
|
||||||
cd ~
|
|
||||||
mkdir torkcvs
|
|
||||||
cd torkcvs
|
|
||||||
cvs -z3 -d:pserver:anonymous@tork.cvs.sourceforge.net:/cvsroot/tork co -P tork
|
|
||||||
cd tork
|
|
||||||
make -f Makefile.cvs
|
|
||||||
./configure
|
|
||||||
make
|
|
||||||
su -c 'make install'
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Basic Installation
|
Basic Installation
|
||||||
==================
|
==================
|
||||||
|
|
||||||
These are generic installation instructions.
|
tork relies on cmake to build.
|
||||||
|
|
||||||
The `configure' shell script attempts to guess correct values for
|
|
||||||
various system-dependent variables used during compilation. It uses
|
|
||||||
those values to create a `Makefile' in each directory of the package.
|
|
||||||
It may also create one or more `.h' files containing system-dependent
|
|
||||||
definitions. Finally, it creates a shell script `config.status' that
|
|
||||||
you can run in the future to recreate the current configuration, a file
|
|
||||||
`config.cache' that saves the results of its tests to speed up
|
|
||||||
reconfiguring, and a file `config.log' containing compiler output
|
|
||||||
(useful mainly for debugging `configure').
|
|
||||||
|
|
||||||
If you need to do unusual things to compile the package, please try
|
|
||||||
to figure out how `configure' could check whether to do them, and mail
|
|
||||||
diffs or instructions to the address given in the `README' so they can
|
|
||||||
be considered for the next release. If at some point `config.cache'
|
|
||||||
contains results you don't want to keep, you may remove or edit it.
|
|
||||||
|
|
||||||
The file `configure.in' is used to create `configure' by a program
|
|
||||||
called `autoconf'. You only need `configure.in' if you want to change
|
|
||||||
it or regenerate `configure' using a newer version of `autoconf'.
|
|
||||||
|
|
||||||
The simplest way to compile this package is:
|
|
||||||
|
|
||||||
1. `cd' to the directory containing the package's source code and type
|
|
||||||
`./configure' to configure the package for your system. If you're
|
|
||||||
using `csh' on an old version of System V, you might need to type
|
|
||||||
`sh ./configure' instead to prevent `csh' from trying to execute
|
|
||||||
`configure' itself.
|
|
||||||
|
|
||||||
Running `configure' takes a while. While running, it prints some
|
|
||||||
messages telling which features it is checking for.
|
|
||||||
|
|
||||||
2. Type `make' to compile the package.
|
|
||||||
|
|
||||||
3. Type `make install' to install the programs and any data files and
|
|
||||||
documentation.
|
|
||||||
|
|
||||||
4. You can remove the program binaries and object files from the
|
|
||||||
source code directory by typing `make clean'.
|
|
||||||
|
|
||||||
Compilers and Options
|
|
||||||
=====================
|
|
||||||
|
|
||||||
Some systems require unusual options for compilation or linking that
|
|
||||||
the `configure' script does not know about. You can give `configure'
|
|
||||||
initial values for variables by setting them in the environment. Using
|
|
||||||
a Bourne-compatible shell, you can do that on the command line like
|
|
||||||
this:
|
|
||||||
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
|
|
||||||
|
|
||||||
Or on systems that have the `env' program, you can do it like this:
|
|
||||||
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
|
|
||||||
|
|
||||||
Compiling For Multiple Architectures
|
|
||||||
====================================
|
|
||||||
|
|
||||||
You can compile the package for more than one kind of computer at the
|
|
||||||
same time, by placing the object files for each architecture in their
|
|
||||||
own directory. To do this, you must use a version of `make' that
|
|
||||||
supports the `VPATH' variable, such as GNU `make'. `cd' to the
|
|
||||||
directory where you want the object files and executables to go and run
|
|
||||||
the `configure' script. `configure' automatically checks for the
|
|
||||||
source code in the directory that `configure' is in and in `..'.
|
|
||||||
|
|
||||||
If you have to use a `make' that does not supports the `VPATH'
|
|
||||||
variable, you have to compile the package for one architecture at a time
|
|
||||||
in the source code directory. After you have installed the package for
|
|
||||||
one architecture, use `make distclean' before reconfiguring for another
|
|
||||||
architecture.
|
|
||||||
|
|
||||||
Installation Names
|
|
||||||
==================
|
|
||||||
|
|
||||||
By default, `make install' will install the package's files in
|
|
||||||
`/usr/local/bin', `/usr/local/man', etc. You can specify an
|
|
||||||
installation prefix other than `/usr/local' by giving `configure' the
|
|
||||||
option `--prefix=PATH'.
|
|
||||||
|
|
||||||
You can specify separate installation prefixes for
|
|
||||||
architecture-specific files and architecture-independent files. If you
|
|
||||||
give `configure' the option `--exec-prefix=PATH', the package will use
|
|
||||||
PATH as the prefix for installing programs and libraries.
|
|
||||||
Documentation and other data files will still use the regular prefix.
|
|
||||||
|
|
||||||
If the package supports it, you can cause programs to be installed
|
|
||||||
with an extra prefix or suffix on their names by giving `configure' the
|
|
||||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
|
||||||
|
|
||||||
Optional Features
|
|
||||||
=================
|
|
||||||
|
|
||||||
Some packages pay attention to `--enable-FEATURE' options to
|
|
||||||
`configure', where FEATURE indicates an optional part of the package.
|
|
||||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
|
||||||
is something like `gnu-as' or `x' (for the X Window System). The
|
|
||||||
`README' should mention any `--enable-' and `--with-' options that the
|
|
||||||
package recognizes.
|
|
||||||
|
|
||||||
For packages that use the X Window System, `configure' can usually
|
|
||||||
find the X include and library files automatically, but if it doesn't,
|
|
||||||
you can use the `configure' options `--x-includes=DIR' and
|
|
||||||
`--x-libraries=DIR' to specify their locations.
|
|
||||||
|
|
||||||
Specifying the System Type
|
|
||||||
==========================
|
|
||||||
|
|
||||||
There may be some features `configure' can not figure out
|
|
||||||
automatically, but needs to determine by the type of host the package
|
|
||||||
will run on. Usually `configure' can figure that out, but if it prints
|
|
||||||
a message saying it can not guess the host type, give it the
|
|
||||||
`--host=TYPE' option. TYPE can either be a short name for the system
|
|
||||||
type, such as `sun4', or a canonical name with three fields:
|
|
||||||
CPU-COMPANY-SYSTEM
|
|
||||||
|
|
||||||
See the file `config.sub' for the possible values of each field. If
|
Here are suggested default options:
|
||||||
`config.sub' isn't included in this package, then this package doesn't
|
|
||||||
need to know the host type.
|
|
||||||
|
|
||||||
If you are building compiler tools for cross-compiling, you can also
|
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
|
||||||
use the `--target=TYPE' option to select the type of system they will
|
-DCONFIG_INSTALL_DIR="/etc/trinity" \
|
||||||
produce code for and the `--build=TYPE' option to select the type of
|
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
|
||||||
system on which you are compiling the package.
|
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
|
||||||
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
|
-DCMAKE_VERBOSE_MAKEFILE="ON" \
|
||||||
|
-DCMAKE_SKIP_RPATH="OFF" \
|
||||||
|
-DBUILD_ALL="ON" \
|
||||||
|
-DWITH_ALL_OPTIONS="ON"
|
||||||
|
|
||||||
Sharing Defaults
|
|
||||||
================
|
|
||||||
|
|
||||||
If you want to set default values for `configure' scripts to share,
|
Requirements:
|
||||||
you can create a site shell script called `config.site' that gives
|
=============
|
||||||
default values for variables like `CC', `cache_file', and `prefix'.
|
|
||||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
|
||||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
|
||||||
`CONFIG_SITE' environment variable to the location of the site script.
|
|
||||||
A warning: not all `configure' scripts look for a site script.
|
|
||||||
|
|
||||||
Operation Controls
|
- torsocks
|
||||||
==================
|
- geoip
|
||||||
|
- openssl
|
||||||
`configure' recognizes the following options to control how it
|
|
||||||
operates.
|
|
||||||
|
|
||||||
`--cache-file=FILE'
|
|
||||||
Use and save the results of the tests in FILE instead of
|
|
||||||
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
|
|
||||||
debugging `configure'.
|
|
||||||
|
|
||||||
`--help'
|
|
||||||
Print a summary of the options to `configure', and exit.
|
|
||||||
|
|
||||||
`--quiet'
|
|
||||||
`--silent'
|
|
||||||
`-q'
|
|
||||||
Do not print messages saying which checks are being made.
|
|
||||||
|
|
||||||
`--srcdir=DIR'
|
|
||||||
Look for the package's source code in directory DIR. Usually
|
|
||||||
`configure' can determine that directory automatically.
|
|
||||||
|
|
||||||
`--version'
|
|
||||||
Print the version of Autoconf used to generate the `configure'
|
|
||||||
script, and exit.
|
|
||||||
|
|
||||||
`configure' also accepts some other, not widely useful, options.
|
|
||||||
|
|
||||||
|
|
||||||
cd ~
|
|
||||||
mkdir torkcvs
|
|
||||||
cd torkcvs
|
|
||||||
cvs -z3 -d:pserver:anonymous@tork.cvs.sourceforge.net:/cvsroot/tork co -P tork
|
|
||||||
cd tork
|
|
||||||
make -f Makefile.cvs
|
|
||||||
./configure
|
|
||||||
make
|
|
||||||
su -c 'make install'
|
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
SUBDIRS = $(TOPSUBDIRS)
|
|
||||||
|
|
||||||
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
|
|
||||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
|
|
||||||
|
|
||||||
$(top_srcdir)/subdirs:
|
|
||||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
|
|
||||||
|
|
||||||
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
|
|
||||||
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
|
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
|
|
||||||
|
|
||||||
package-messages:
|
|
||||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
|
|
||||||
$(MAKE) -C po merge
|
|
||||||
|
|
||||||
EXTRA_DIST = admin COPYING configure.in.in
|
|
||||||
|
|
||||||
misc_DATA = tips
|
|
||||||
miscdir = $(kde_datadir)/tork
|
|
||||||
|
|
||||||
dist-hook:
|
|
||||||
cd $(top_distdir) && perl admin/am_edit -padmin
|
|
||||||
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
|
|
@ -1,10 +0,0 @@
|
|||||||
all:
|
|
||||||
@echo "This Makefile is only for the CVS repository"
|
|
||||||
@echo "This will be deleted before making the distribution"
|
|
||||||
@echo ""
|
|
||||||
$(MAKE) -f admin/Makefile.common cvs
|
|
||||||
|
|
||||||
dist:
|
|
||||||
$(MAKE) -f admin/Makefile.common dist
|
|
||||||
|
|
||||||
.SILENT:
|
|
@ -1,5 +0,0 @@
|
|||||||
See http://tork.anonymityanywhere.com for more info.
|
|
||||||
|
|
||||||
For instructions on verifying the source tarballs see:
|
|
||||||
|
|
||||||
http://verifytork.anonymityanywhere.com
|
|
@ -0,0 +1,43 @@
|
|||||||
|
|
||||||
|
TorK - anonymity manager for TDE.
|
||||||
|
|
||||||
|
|
||||||
|
TorK is an anonymity manager for the Trinity desktop.
|
||||||
|
Browse anonymously on Konqueror, Iceweasel or Opera.
|
||||||
|
Send anonymous email via the MixMinion network.
|
||||||
|
Use ssh, IRC and IM anonymously. Control and monitor
|
||||||
|
your anonymous traffic and non-anonymous traffic on
|
||||||
|
the Tor network.
|
||||||
|
|
||||||
|
.
|
||||||
|
|
||||||
|
Contributing
|
||||||
|
--------------
|
||||||
|
|
||||||
|
If you wish to contribute to tork, you might do so:
|
||||||
|
|
||||||
|
- TDE Gitea Workspace (TGW) collaboration tool.
|
||||||
|
https://mirror.git.trinitydesktop.org/gitea
|
||||||
|
|
||||||
|
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
|
||||||
|
https://mirror.git.trinitydesktop.org/weblate
|
||||||
|
|
||||||
|
|
||||||
|
Translations status
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
### messages
|
||||||
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tork/multi-auto.svg
|
||||||
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tork/)
|
||||||
|
|
||||||
|
### applet
|
||||||
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tork-applet/multi-auto.svg
|
||||||
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tork-applet/)
|
||||||
|
|
||||||
|
### desktop files
|
||||||
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tork-desktop-files/multi-auto.svg
|
||||||
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tork-desktop-files/)
|
||||||
|
|
||||||
|
### events
|
||||||
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tork-events/multi-auto.svg
|
||||||
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tork-events/)
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
|||||||
Subproject commit a7f75ac0ff587d5b8694a1b78557597161f8104c
|
|
@ -1,334 +0,0 @@
|
|||||||
/* config.h.in. Generated from configure.in by autoheader. */
|
|
||||||
|
|
||||||
/* Define if building universal (internal helper macro) */
|
|
||||||
#undef AC_APPLE_UNIVERSAL_BUILD
|
|
||||||
|
|
||||||
/* "Shallot will compile for BSD" */
|
|
||||||
#undef BSD
|
|
||||||
|
|
||||||
/* tork's configuration directory */
|
|
||||||
#undef CONFDIR
|
|
||||||
|
|
||||||
/* "Using External GeoIP" */
|
|
||||||
#undef EXTERNAL_GEOIP
|
|
||||||
|
|
||||||
/* "Shallot will compile for GENERIC" */
|
|
||||||
#undef GENERIC
|
|
||||||
|
|
||||||
/* Define to the type of elements in the array set by `getgroups'. Usually
|
|
||||||
this is either `int' or `gid_t'. */
|
|
||||||
#undef GETGROUPS_T
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
|
|
||||||
#undef HAVE_CARBON_CARBON_H
|
|
||||||
|
|
||||||
/* Define if you have the CoreAudio API */
|
|
||||||
#undef HAVE_COREAUDIO
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <crt_externs.h> header file. */
|
|
||||||
#undef HAVE_CRT_EXTERNS_H
|
|
||||||
|
|
||||||
/* Defines if your system has the crypt function */
|
|
||||||
#undef HAVE_CRYPT
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
|
||||||
#undef HAVE_DLFCN_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <GeoIP.h> header file. */
|
|
||||||
#undef HAVE_GEOIP_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `getcwd' function. */
|
|
||||||
#undef HAVE_GETCWD
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `getopt_long' function. */
|
|
||||||
#undef HAVE_GETOPT_LONG
|
|
||||||
|
|
||||||
/* Define this when you are able to redeclare getpw functions. */
|
|
||||||
#undef HAVE_GETPW_DECLS
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `getwd' function. */
|
|
||||||
#undef HAVE_GETWD
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
|
||||||
#undef HAVE_INTTYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <libiberty.h> header file. */
|
|
||||||
#undef HAVE_LIBIBERTY_H
|
|
||||||
|
|
||||||
/* Define if you have libjpeg */
|
|
||||||
#undef HAVE_LIBJPEG
|
|
||||||
|
|
||||||
/* Define if you have libpng */
|
|
||||||
#undef HAVE_LIBPNG
|
|
||||||
|
|
||||||
/* Define if you have a working libpthread (will enable threaded code) */
|
|
||||||
#undef HAVE_LIBPTHREAD
|
|
||||||
|
|
||||||
/* Define if you have libz */
|
|
||||||
#undef HAVE_LIBZ
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <linux/netfilter_ipv4.h> header file. */
|
|
||||||
#undef HAVE_LINUX_NETFILTER_IPV4_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `memcpy' function. */
|
|
||||||
#undef HAVE_MEMCPY
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <memory.h> header file. */
|
|
||||||
#undef HAVE_MEMORY_H
|
|
||||||
|
|
||||||
/* Define if your system needs _NSGetEnviron to set up the environment */
|
|
||||||
#undef HAVE_NSGETENVIRON
|
|
||||||
|
|
||||||
/* Define if you have res_init */
|
|
||||||
#undef HAVE_RES_INIT
|
|
||||||
|
|
||||||
/* Define if you have the res_init prototype */
|
|
||||||
#undef HAVE_RES_INIT_PROTO
|
|
||||||
|
|
||||||
/* Define if you have a STL implementation by SGI */
|
|
||||||
#undef HAVE_SGI_STL
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `snprintf' function. */
|
|
||||||
#undef HAVE_SNPRINTF
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdint.h> header file. */
|
|
||||||
#undef HAVE_STDINT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
|
||||||
#undef HAVE_STDLIB_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `strchr' function. */
|
|
||||||
#undef HAVE_STRCHR
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <strings.h> header file. */
|
|
||||||
#undef HAVE_STRINGS_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <string.h> header file. */
|
|
||||||
#undef HAVE_STRING_H
|
|
||||||
|
|
||||||
/* Define if you have strlcat */
|
|
||||||
#undef HAVE_STRLCAT
|
|
||||||
|
|
||||||
/* Define if you have the strlcat prototype */
|
|
||||||
#undef HAVE_STRLCAT_PROTO
|
|
||||||
|
|
||||||
/* Define if you have strlcpy */
|
|
||||||
#undef HAVE_STRLCPY
|
|
||||||
|
|
||||||
/* Define if you have the strlcpy prototype */
|
|
||||||
#undef HAVE_STRLCPY_PROTO
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/bitypes.h> header file. */
|
|
||||||
#undef HAVE_SYS_BITYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/socket.h> header file. */
|
|
||||||
#undef HAVE_SYS_SOCKET_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
||||||
#undef HAVE_SYS_STAT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
|
||||||
#undef HAVE_SYS_TYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
|
||||||
#undef HAVE_UNISTD_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `vsnprintf' function. */
|
|
||||||
#undef HAVE_VSNPRINTF
|
|
||||||
|
|
||||||
/* Suffix for lib directories */
|
|
||||||
#undef KDELIBSUFF
|
|
||||||
|
|
||||||
/* Define a safe value for MAXPATHLEN */
|
|
||||||
#undef KDEMAXPATHLEN
|
|
||||||
|
|
||||||
/* "Shallot will compile for Linux" */
|
|
||||||
#undef LINUX_PORT
|
|
||||||
|
|
||||||
/* "Define to compile for a LiveCD" */
|
|
||||||
#undef LIVECD
|
|
||||||
|
|
||||||
/* Define if you need xmalloc(). */
|
|
||||||
#undef NEED_XMALLOC
|
|
||||||
|
|
||||||
/* Name of package */
|
|
||||||
#undef PACKAGE
|
|
||||||
|
|
||||||
/* Define to the address where bug reports for this package should be sent. */
|
|
||||||
#undef PACKAGE_BUGREPORT
|
|
||||||
|
|
||||||
/* Define to the full name of this package. */
|
|
||||||
#undef PACKAGE_NAME
|
|
||||||
|
|
||||||
/* Define to the full name and version of this package. */
|
|
||||||
#undef PACKAGE_STRING
|
|
||||||
|
|
||||||
/* Define to the one symbol short name of this package. */
|
|
||||||
#undef PACKAGE_TARNAME
|
|
||||||
|
|
||||||
/* Define to the home page for this package. */
|
|
||||||
#undef PACKAGE_URL
|
|
||||||
|
|
||||||
/* Define to the version of this package. */
|
|
||||||
#undef PACKAGE_VERSION
|
|
||||||
|
|
||||||
/* The size of `char *', as computed by sizeof. */
|
|
||||||
#undef SIZEOF_CHAR_P
|
|
||||||
|
|
||||||
/* The size of `int', as computed by sizeof. */
|
|
||||||
#undef SIZEOF_INT
|
|
||||||
|
|
||||||
/* The size of `long', as computed by sizeof. */
|
|
||||||
#undef SIZEOF_LONG
|
|
||||||
|
|
||||||
/* The size of `short', as computed by sizeof. */
|
|
||||||
#undef SIZEOF_SHORT
|
|
||||||
|
|
||||||
/* The size of `size_t', as computed by sizeof. */
|
|
||||||
#undef SIZEOF_SIZE_T
|
|
||||||
|
|
||||||
/* The size of `unsigned long', as computed by sizeof. */
|
|
||||||
#undef SIZEOF_UNSIGNED_LONG
|
|
||||||
|
|
||||||
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
|
|
||||||
#undef STAT_MACROS_BROKEN
|
|
||||||
|
|
||||||
/* Define to 1 if you have the ANSI C header files. */
|
|
||||||
#undef STDC_HEADERS
|
|
||||||
|
|
||||||
/* "Define to enable failsafe support" */
|
|
||||||
#undef USE_FAILSAFE
|
|
||||||
|
|
||||||
/* use openssl for ssl session decryption instead of gnutls */
|
|
||||||
#undef USE_OPENSSL
|
|
||||||
|
|
||||||
/* Version number of package */
|
|
||||||
#undef VERSION
|
|
||||||
|
|
||||||
/* Defined if compiling without arts */
|
|
||||||
#undef WITHOUT_ARTS
|
|
||||||
|
|
||||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
|
||||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
|
||||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
|
||||||
# if defined __BIG_ENDIAN__
|
|
||||||
# define WORDS_BIGENDIAN 1
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# ifndef WORDS_BIGENDIAN
|
|
||||||
# undef WORDS_BIGENDIAN
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
|
|
||||||
* headers and I'm too lazy to write a configure test as long as only
|
|
||||||
* unixware is related
|
|
||||||
*/
|
|
||||||
#ifdef _UNIXWARE
|
|
||||||
#define HAVE_BOOLEAN
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
|
|
||||||
* that defines bzero.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(_AIX)
|
|
||||||
#include <strings.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
|
|
||||||
# include <sys/time.h>
|
|
||||||
# include <crt_externs.h>
|
|
||||||
# define environ (*_NSGetEnviron())
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(HAVE_RES_INIT_PROTO)
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
int res_init(void);
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(HAVE_STRLCAT_PROTO)
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
unsigned long strlcat(char*, const char*, unsigned long);
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(HAVE_STRLCPY_PROTO)
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
unsigned long strlcpy(char*, const char*, unsigned long);
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* On HP-UX, the declaration of vsnprintf() is needed every time !
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
|
|
||||||
#if __STDC__
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#else
|
|
||||||
#include <varargs.h>
|
|
||||||
#endif
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
int snprintf(char *str, size_t n, char const *fmt, ...);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(__SVR4) && !defined(__svr4__)
|
|
||||||
#define __svr4__ 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Define to empty if `const' does not conform to ANSI C. */
|
|
||||||
#undef const
|
|
||||||
|
|
||||||
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
||||||
#undef gid_t
|
|
||||||
|
|
||||||
/* type to use in place of socklen_t if not defined */
|
|
||||||
#undef kde_socklen_t
|
|
||||||
|
|
||||||
/* type to use in place of socklen_t if not defined (deprecated, use
|
|
||||||
kde_socklen_t) */
|
|
||||||
#undef ksize_t
|
|
||||||
|
|
||||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
|
||||||
#undef size_t
|
|
||||||
|
|
||||||
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
||||||
#undef uid_t
|
|
@ -1,2 +0,0 @@
|
|||||||
./admin/configure.in.min
|
|
||||||
configure.in.in
|
|
@ -1,691 +0,0 @@
|
|||||||
dnl =======================================================
|
|
||||||
dnl FILE: ./admin/configure.in.min
|
|
||||||
dnl =======================================================
|
|
||||||
|
|
||||||
dnl This file is part of the KDE libraries/packages
|
|
||||||
dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
|
|
||||||
|
|
||||||
dnl This file is free software; you can redistribute it and/or
|
|
||||||
dnl modify it under the terms of the GNU Library General Public
|
|
||||||
dnl License as published by the Free Software Foundation; either
|
|
||||||
dnl version 2 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
dnl This library is distributed in the hope that it will be useful,
|
|
||||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
dnl Library General Public License for more details.
|
|
||||||
|
|
||||||
dnl You should have received a copy of the GNU Library General Public License
|
|
||||||
dnl along with this library; see the file COPYING.LIB. If not, write to
|
|
||||||
dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
||||||
dnl Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
# Original Author was Kalle@kde.org
|
|
||||||
# I lifted it in some mater. (Stephan Kulow)
|
|
||||||
# I used much code from Janos Farkas
|
|
||||||
|
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
|
||||||
|
|
||||||
AC_INIT(acinclude.m4) dnl a source file from your sub dir
|
|
||||||
|
|
||||||
dnl This is so we can use kde-common
|
|
||||||
AC_CONFIG_AUX_DIR(admin)
|
|
||||||
|
|
||||||
dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
|
|
||||||
unset CDPATH
|
|
||||||
|
|
||||||
dnl Checking host/target/build systems, for make, install etc.
|
|
||||||
AC_CANONICAL_SYSTEM
|
|
||||||
dnl Perform program name transformation
|
|
||||||
AC_ARG_PROGRAM
|
|
||||||
|
|
||||||
dnl Automake doc recommends to do this only here. (Janos)
|
|
||||||
AM_INIT_AUTOMAKE(tork, 0.1) dnl searches for some needed programs
|
|
||||||
|
|
||||||
KDE_SET_PREFIX
|
|
||||||
|
|
||||||
dnl generate the config header
|
|
||||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
|
||||||
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_CHECK_COMPILERS
|
|
||||||
AC_ENABLE_SHARED(yes)
|
|
||||||
AC_ENABLE_STATIC(no)
|
|
||||||
KDE_PROG_LIBTOOL
|
|
||||||
|
|
||||||
dnl for NLS support. Call them in this order!
|
|
||||||
dnl WITH_NLS is for the po files
|
|
||||||
AM_KDE_WITH_NLS
|
|
||||||
|
|
||||||
KDE_USE_TQT(3.3.5)
|
|
||||||
AC_PATH_KDE
|
|
||||||
dnl =======================================================
|
|
||||||
dnl FILE: configure.in.in
|
|
||||||
dnl =======================================================
|
|
||||||
|
|
||||||
#MIN_CONFIG(3.3.5)
|
|
||||||
|
|
||||||
dnl PACKAGE set before
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
AC_CHECK_KDEMAXPATHLEN
|
|
||||||
|
|
||||||
# ---- Taken from KOffice ----------------------
|
|
||||||
# --- Check for KDE 3.2 or 3.3 or 3.4 or 3.5 ---
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for KDE version])
|
|
||||||
|
|
||||||
AC_LANG_SAVE
|
|
||||||
AC_LANG_CPLUSPLUS
|
|
||||||
tdeversion_save_CXXFLAGS="$CXXFLAGS"
|
|
||||||
tdeversion_safe_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
|
||||||
CXXFLAGS="$CXXFLAGS $all_includes"
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
|
|
||||||
#error KDE 3.2
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde32_compat="no"
|
|
||||||
,
|
|
||||||
need_kde32_compat="yes"
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
|
|
||||||
#error KDE 3.3
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde33_compat="no"
|
|
||||||
,
|
|
||||||
need_kde33_compat="yes"
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
|
|
||||||
#error KDE 3.4
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde34_compat="no"
|
|
||||||
,
|
|
||||||
need_kde34_compat="yes"
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
|
|
||||||
#error KDE 3.5.x (x < 2)
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde351_compat="no"
|
|
||||||
,
|
|
||||||
need_kde351_compat="yes"
|
|
||||||
)
|
|
||||||
CXXFLAGS="$tdeversion_save_CXXFLAGS"
|
|
||||||
LIBS="$tdeversion_safe_LIBS"
|
|
||||||
AC_LANG_RESTORE
|
|
||||||
|
|
||||||
if test "$need_kde32_compat" = "yes"; then
|
|
||||||
AC_MSG_ERROR([You have KDE 3.2.x. TorK needs KDE 3.5.1 or greater.])
|
|
||||||
else
|
|
||||||
if test "$need_kde33_compat" = "yes"; then
|
|
||||||
AC_MSG_ERROR([You have KDE 3.3.x TorK needs KDE 3.5.1 or greater.])
|
|
||||||
else
|
|
||||||
if test "$need_kde34_compat" = "yes"; then
|
|
||||||
AC_MSG_ERROR([You have KDE 3.4.x TorK needs KDE 3.5.1 or greater.])
|
|
||||||
else
|
|
||||||
if test "$need_kde351_compat" = "yes"; then
|
|
||||||
AC_MSG_RESULT([KDE 3.5.x (x >=1) or SVN trunk])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# --- End KDE 3.2 check ---
|
|
||||||
|
|
||||||
# --- Begin libgnutls macro ---
|
|
||||||
|
|
||||||
dnl Autoconf macros for libgnutls
|
|
||||||
dnl $id$
|
|
||||||
|
|
||||||
# Modified for LIBGNUTLS -- nmav
|
|
||||||
# Configure paths for LIBGCRYPT
|
|
||||||
# Shamelessly stolen from the one of XDELTA by Owen Taylor
|
|
||||||
# Werner Koch 99-12-09
|
|
||||||
|
|
||||||
dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
|
||||||
dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_LIBGNUTLS],
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from the libgnutls-config script
|
|
||||||
dnl
|
|
||||||
AC_ARG_WITH(libgnutls-prefix,
|
|
||||||
[ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
|
|
||||||
libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
|
|
||||||
|
|
||||||
if test x$libgnutls_config_prefix != x ; then
|
|
||||||
if test x${LIBGNUTLS_CONFIG+set} != xset ; then
|
|
||||||
LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
|
|
||||||
min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
|
|
||||||
AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
|
|
||||||
no_libgnutls=""
|
|
||||||
if test "$LIBGNUTLS_CONFIG" = "no" ; then
|
|
||||||
no_libgnutls=yes
|
|
||||||
else
|
|
||||||
LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
|
|
||||||
LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
|
|
||||||
libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
|
|
||||||
|
|
||||||
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
|
|
||||||
LIBS="$LIBS $LIBGNUTLS_LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed libgnutls is sufficiently new. Also sanity
|
|
||||||
dnl checks the results of libgnutls-config to some extent
|
|
||||||
dnl
|
|
||||||
rm -f conf.libgnutlstest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <gnutls/gnutls.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
system ("touch conf.libgnutlstest");
|
|
||||||
|
|
||||||
if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
|
|
||||||
{
|
|
||||||
printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
|
|
||||||
"$libgnutls_config_version", gnutls_check_version(NULL) );
|
|
||||||
printf("*** was found! If libgnutls-config was correct, then it is best\n");
|
|
||||||
printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
|
|
||||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
||||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
||||||
printf("*** required on your system.\n");
|
|
||||||
printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
|
|
||||||
printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
|
|
||||||
printf("*** before re-running configure\n");
|
|
||||||
}
|
|
||||||
else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
|
|
||||||
{
|
|
||||||
printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
|
|
||||||
printf("*** library (version %s)\n", gnutls_check_version(NULL) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( gnutls_check_version( "$min_libgnutls_version" ) )
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
|
|
||||||
gnutls_check_version(NULL) );
|
|
||||||
printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
|
|
||||||
"$min_libgnutls_version" );
|
|
||||||
printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
|
|
||||||
printf("*** \n");
|
|
||||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
||||||
printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
|
|
||||||
printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
|
|
||||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
||||||
printf("*** so that the correct libraries are found at run-time))\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$no_libgnutls" = x ; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
if test -f conf.libgnutlstest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
fi
|
|
||||||
if test "$LIBGNUTLS_CONFIG" = "no" ; then
|
|
||||||
echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
|
|
||||||
echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
|
|
||||||
echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
|
|
||||||
echo "*** full path to libgnutls-config."
|
|
||||||
else
|
|
||||||
if test -f conf.libgnutlstest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run libgnutls test program, checking why..."
|
|
||||||
CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
|
|
||||||
LIBS="$LIBS $LIBGNUTLS_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <gnutls/gnutls.h>
|
|
||||||
], [ return !!gnutls_check_version(NULL); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
|
|
||||||
echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
|
|
||||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
||||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
||||||
echo "*** is required on your system"
|
|
||||||
echo "***"
|
|
||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
||||||
echo "***" ],
|
|
||||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
|
|
||||||
echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
|
|
||||||
echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
LIBGNUTLS_CFLAGS=""
|
|
||||||
LIBGNUTLS_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
rm -f conf.libgnutlstest
|
|
||||||
AC_SUBST(LIBGNUTLS_CFLAGS)
|
|
||||||
AC_SUBST(LIBGNUTLS_LIBS)
|
|
||||||
])
|
|
||||||
|
|
||||||
# --- End libgnutls macro ---
|
|
||||||
|
|
||||||
|
|
||||||
dnl Compile with GNUTLS
|
|
||||||
AC_ARG_ENABLE(gnutls,
|
|
||||||
AS_HELP_STRING(--enable-gnutls, Compile with GnuTLS))
|
|
||||||
|
|
||||||
if test x$enable_gnutls = xyes; then
|
|
||||||
|
|
||||||
# gnu tls
|
|
||||||
#AM_PATH_LIBGNUTLS(1.0.0, , [
|
|
||||||
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], , [
|
|
||||||
AC_DEFINE(USE_OPENSSL, 1, [use openssl for ssl session decryption instead of gnutls])
|
|
||||||
AC_SUBST(USE_OPENSSL)
|
|
||||||
])
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- If no gnutls check for openssl ---
|
|
||||||
|
|
||||||
if test "x$LIBGNUTLS_LIBS" = "x"; then
|
|
||||||
|
|
||||||
AC_DEFINE(USE_OPENSSL, 1, [use openssl for ssl session decryption instead of gnutls])
|
|
||||||
AC_SUBST(USE_OPENSSL)
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- End of If no gnutls check for openssl ---
|
|
||||||
|
|
||||||
# Even if gnutls is required, we still need openssl for shallot.
|
|
||||||
|
|
||||||
dnl ------------------------------------------------------
|
|
||||||
dnl Where do you live, openssl? And how do we call you?
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssl_dir, [
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
saved_LDFLAGS="$LDFLAGS"
|
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
|
||||||
ssl_found=no
|
|
||||||
for ssldir in $tryssldir "" $prefix /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /usr/pkg /opt /opt/openssl ; do
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
SSL_LIBS="-lssl -lcrypto"
|
|
||||||
LIBS="$saved_LIBS $SSL_LIBS"
|
|
||||||
|
|
||||||
# Skip the directory if it isn't there.
|
|
||||||
if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
|
|
||||||
continue;
|
|
||||||
fi
|
|
||||||
if test ! -z "$ssldir" ; then
|
|
||||||
if test -d "$ssldir/lib" ; then
|
|
||||||
LDFLAGS="-L$ssldir/lib $LDFLAGS"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L$ssldir $LDFLAGS"
|
|
||||||
fi
|
|
||||||
if test -d "$ssldir/include" ; then
|
|
||||||
CPPFLAGS="-I$ssldir/include $CPPFLAGS"
|
|
||||||
else
|
|
||||||
CPPFLAGS="-I$ssldir $CPPFLAGS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# Can I link it?
|
|
||||||
AC_TRY_LINK([#include <openssl/rand.h>],
|
|
||||||
[ RAND_add((void*)0,0,0); ],
|
|
||||||
[ openssl_linked=yes ], [ openssl_linked=no ])
|
|
||||||
if test $openssl_linked = yes; then
|
|
||||||
if test ! -z "$ssldir" ; then
|
|
||||||
ac_cv_openssl_dir=$ssldir
|
|
||||||
else
|
|
||||||
ac_cv_openssl_dir="(system)"
|
|
||||||
fi
|
|
||||||
ssl_found=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
LIBS="$saved_LIBS"
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
CPPFLAGS="$saved_CPPFLAGS"
|
|
||||||
if test $ssl_found = no ; then
|
|
||||||
AC_MSG_ERROR([Could not find a linkable OpenSSL. You can specify an explicit path using --with-ssl-dir])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
SSL_LIBS="-lssl -lcrypto"
|
|
||||||
LIBS="$saved_LIBS $SSL_LIBS"
|
|
||||||
|
|
||||||
if test "$ac_cv_openssl_dir" != "(system)"; then
|
|
||||||
if test -d "$ac_cv_openssl_dir/lib" ; then
|
|
||||||
LDFLAGS="-L$ac_cv_openssl_dir/lib $LDFLAGS"
|
|
||||||
ssl_libdir="$ac_cv_openssl_dir/lib"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L$ac_cv_openssl_dir $LDFLAGS"
|
|
||||||
ssl_libdir="$ac_cv_openssl_dir"
|
|
||||||
fi
|
|
||||||
if test -d "$ac_cv_openssl_dir/include" ; then
|
|
||||||
CPPFLAGS="-I$ac_cv_openssl_dir/include $CPPFLAGS"
|
|
||||||
else
|
|
||||||
CPPFLAGS="-I$ac_cv_openssl_dir $CPPFLAGS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([whether we need extra options to link OpenSSL],
|
|
||||||
ac_cv_openssl_linker_option, [
|
|
||||||
saved_LDFLAGS="$LDFLAGS"
|
|
||||||
ssl_runs=no
|
|
||||||
linked_with=nothing
|
|
||||||
for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do
|
|
||||||
LDFLAGS="$ssl_extra $saved_LDFLAGS"
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <string.h>
|
|
||||||
#include <openssl/rand.h>
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
char a[2048];
|
|
||||||
memset(a, 0, sizeof(a));
|
|
||||||
RAND_add(a, sizeof(a), sizeof(a));
|
|
||||||
return(RAND_status() <= 0);
|
|
||||||
}
|
|
||||||
],
|
|
||||||
openssl_runs=yes, openssl_runs=no)
|
|
||||||
if test $openssl_runs = yes ; then
|
|
||||||
if test "$linked_with" = nothing; then
|
|
||||||
linked_with="$ssl_extra"
|
|
||||||
fi
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <openssl/opensslv.h>
|
|
||||||
#include <openssl/crypto.h>
|
|
||||||
int main(void) {
|
|
||||||
return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0;
|
|
||||||
}],
|
|
||||||
right_version=yes, right_version=no)
|
|
||||||
if test "$right_version" = yes; then
|
|
||||||
if test -z "$ssl_extra" ; then
|
|
||||||
ac_cv_openssl_linker_option='(none)'
|
|
||||||
else
|
|
||||||
ac_cv_openssl_linker_option=$ssl_extra
|
|
||||||
fi
|
|
||||||
ssl_runs=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test $ssl_runs = no ; then
|
|
||||||
if test "$linked_with" = 'nothing' ; then
|
|
||||||
AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?])
|
|
||||||
else
|
|
||||||
if test -z "$linked_with" ; then
|
|
||||||
ac_cv_openssl_linker_option='(none)'
|
|
||||||
else
|
|
||||||
ac_cv_openssl_linker_option=$linked_with
|
|
||||||
fi
|
|
||||||
AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
])
|
|
||||||
|
|
||||||
if test "$ac_cv_openssl_linker_option" != '(none)' ; then
|
|
||||||
LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LIBS="$saved_LIBS"
|
|
||||||
|
|
||||||
# --- Decide which library to use for linking Tork ---
|
|
||||||
# --- SSL will be used for shallot ---
|
|
||||||
|
|
||||||
if test "x$LIBGNUTLS_LIBS" = "x"; then
|
|
||||||
CRYPTO_LIBS=$SSL_LIBS
|
|
||||||
else
|
|
||||||
CRYPTO_LIBS=$LIBGNUTLS_LIBS
|
|
||||||
fi
|
|
||||||
AC_SUBST(CRYPTO_LIBS)
|
|
||||||
AC_SUBST(SSL_LIBS)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dnl - GeoIP
|
|
||||||
|
|
||||||
AC_ARG_WITH(external-geoip,
|
|
||||||
AC_HELP_STRING([--with-external-geoip], [Build against an external copy of GeoIP]))
|
|
||||||
|
|
||||||
if test "x$with_external_geoip" != "xyes"; then
|
|
||||||
GEOVERSION=1.4.2
|
|
||||||
dnl PACKAGE=GeoIP
|
|
||||||
GEOIP_VERSION_INFO=`echo $GEOVERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
|
|
||||||
AC_SUBST(GEOIP_VERSION_INFO)
|
|
||||||
|
|
||||||
AC_ARG_WITH(city,
|
|
||||||
[ --with-city=\"no\" Enable/disable support for GeoIP City Edition. (yes)])
|
|
||||||
if test "$with_city" = "no" ; then
|
|
||||||
echo Disabling GeoIP City Edition support
|
|
||||||
WITH_CITY=1
|
|
||||||
else
|
|
||||||
echo Enabling GeoIP City Edition support
|
|
||||||
WITH_CITY=0
|
|
||||||
fi
|
|
||||||
AC_SUBST(WITH_CITY)
|
|
||||||
else
|
|
||||||
with_city=no
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS([GeoIP.h],,
|
|
||||||
[AC_MSG_ERROR([External GeoIP requested but GeoIP not found.])])
|
|
||||||
AC_CHECK_LIB([GeoIP], [GeoIP_new], [GEOIPLIB=-lGeoIP],
|
|
||||||
[AC_MSG_ERROR([External GeoIP requested but GeoIP not found.])])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL(WITH_CITY, test "$with_city" != "no")
|
|
||||||
AM_CONDITIONAL([EXTERNAL_GEOIP], [test "x$with_external_geoip" = "xyes"])
|
|
||||||
|
|
||||||
if test x$with_external_geoip = xyes; then
|
|
||||||
AC_DEFINE(EXTERNAL_GEOIP, 1, "Using External GeoIP")
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dnl - libwhich
|
|
||||||
|
|
||||||
which_cv_iberty=no
|
|
||||||
AC_ARG_ENABLE(iberty,
|
|
||||||
[ --disable-iberty do not try to find and use the iberty library],
|
|
||||||
which_cv_iberty=$enableval)
|
|
||||||
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_PROG_INSTALL
|
|
||||||
AC_LANG_C
|
|
||||||
|
|
||||||
|
|
||||||
AC_DEFUN([BASH_CHECK_GETPW_FUNCS],
|
|
||||||
[AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
|
|
||||||
AC_CACHE_VAL(bash_cv_can_redecl_getpw,
|
|
||||||
[AC_TRY_COMPILE([#include <sys/types.h>
|
|
||||||
#include <pwd.h>
|
|
||||||
extern struct passwd *getpwent();
|
|
||||||
extern struct passwd *getpwuid();
|
|
||||||
extern struct passwd *getpwnam();],
|
|
||||||
[struct passwd *z; z = getpwent(); z = getpwuid(0); z = getpwnam("root");],
|
|
||||||
bash_cv_can_redecl_getpw=yes,bash_cv_can_redecl_getpw=no)])
|
|
||||||
AC_MSG_RESULT($bash_cv_can_redecl_getpw)
|
|
||||||
if test $bash_cv_can_redecl_getpw = no; then
|
|
||||||
AC_DEFINE([HAVE_GETPW_DECLS], 1, [Define this when you are able to redeclare getpw functions.])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
dnl Checks for header files.
|
|
||||||
AC_HEADER_STDC
|
|
||||||
AC_CHECK_FUNCS(strchr memcpy getopt_long)
|
|
||||||
AC_CHECK_HEADERS(unistd.h string.h libiberty.h)
|
|
||||||
AC_HEADER_STAT
|
|
||||||
|
|
||||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
||||||
AC_C_CONST
|
|
||||||
AC_TYPE_SIZE_T
|
|
||||||
|
|
||||||
dnl Checks for library functions.
|
|
||||||
AC_TYPE_GETGROUPS
|
|
||||||
AC_CHECK_FUNCS(getcwd getwd)
|
|
||||||
|
|
||||||
AC_DEFINE([NEED_XMALLOC], 1, [Define if you need xmalloc().])
|
|
||||||
|
|
||||||
dnl Additional stuff needed for the tilde directory
|
|
||||||
AC_CHECK_PROG(AR, ar, ar, ar)
|
|
||||||
AC_PROG_RANLIB
|
|
||||||
AC_CHECK_HEADERS(stdlib.h)
|
|
||||||
BASH_CHECK_GETPW_FUNCS
|
|
||||||
|
|
||||||
if test "x$CONFDIR" = "x"; then
|
|
||||||
CONFDIR=`eval echo $sysconfdir`
|
|
||||||
fi
|
|
||||||
AC_SUBST(CONFDIR)
|
|
||||||
AH_TEMPLATE([CONFDIR],[tork's configuration directory])
|
|
||||||
AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR")
|
|
||||||
|
|
||||||
|
|
||||||
dnl Disable stuff that's not suitable for a Live CD
|
|
||||||
AC_ARG_ENABLE(live-cd,
|
|
||||||
AS_HELP_STRING(--enable-live-cd, Disable Features Unsuitable for LiveCD))
|
|
||||||
|
|
||||||
if test x$enable_live_cd = xyes; then
|
|
||||||
AC_DEFINE(LIVECD, 1, "Define to compile for a LiveCD")
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Detect OS for Shallot compilation
|
|
||||||
|
|
||||||
case "$host" in
|
|
||||||
*-*-linux*) AC_DEFINE(LINUX_PORT, 1, "Shallot will compile for Linux") ;;
|
|
||||||
*-*-freebsd*) AC_DEFINE(BSD, 1, "Shallot will compile for BSD") ;;
|
|
||||||
*-*-netbsd*) AC_DEFINE(BSD, 1, "Shallot will compile for BSD") ;;
|
|
||||||
*-*-openbsd*) AC_DEFINE(BSD, 1, "Shallot will compile for BSD") ;;
|
|
||||||
*) AC_DEFINE(GENERIC, 1, "Shallot will compile for GENERIC") ;;
|
|
||||||
esac
|
|
||||||
#AC_DEFINE(_GNU_SOURCE, 1, "Shallot will compile with _GNU_SOURCE")
|
|
||||||
# USE_GNU_SOURCE above is used instead and _GNU_SOURCE defined in shallot.
|
|
||||||
|
|
||||||
dnl Check for presence of torsocks
|
|
||||||
AC_CHECK_PROG(TORSOCKS, torsocks, torsocks)
|
|
||||||
if test "${TORSOCKS}" = ""; then
|
|
||||||
AC_MSG_ERROR('TorK requires torsocks: http://code.google.com/p/torsocks')
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl detect netfilter
|
|
||||||
AC_CHECK_HEADERS(sys/types.h sys/socket.h)
|
|
||||||
AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
|
|
||||||
linux_netfilter_ipv4=1, linux_netfilter_ipv4=0)
|
|
||||||
|
|
||||||
|
|
||||||
failsafe_ok=0
|
|
||||||
if test x$linux_netfilter_ipv4 = x1 ; then
|
|
||||||
failsafe_ok=1
|
|
||||||
fi
|
|
||||||
if test x$failsafe_ok = x1 ; then
|
|
||||||
AC_DEFINE(USE_FAILSAFE, 1, "Define to enable failsafe support")
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([src/menu/tork])
|
|
||||||
KDE_CREATE_SUBDIRSLIST
|
|
||||||
AC_CONFIG_FILES([ Makefile ])
|
|
||||||
AC_CONFIG_FILES([ doc/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ doc/en/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ po/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/GeoIP-1.4.0/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/GeoIP-1.4.0/data/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/GeoIP-1.4.0/libGeoIP/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/arkollon/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/icons/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/konqplugin/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/menu/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/privoxytemplates/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/tor_ioslave/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/torkapplet/Makefile ])
|
|
||||||
AC_CONFIG_FILES([ src/upnp/Makefile ])
|
|
||||||
AC_OUTPUT
|
|
||||||
# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
|
|
||||||
if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
|
|
||||||
# And if so, warn when they don't match
|
|
||||||
if test "$kde_libs_prefix" != "$given_prefix"; then
|
|
||||||
# And if kde doesn't know about the prefix yet
|
|
||||||
echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
|
|
||||||
if test $? -ne 0; then
|
|
||||||
echo ""
|
|
||||||
echo "Warning: you chose to install this package in $given_prefix,"
|
|
||||||
echo "but KDE was found in $kde_libs_prefix."
|
|
||||||
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
|
|
||||||
echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
|
|
||||||
echo "Then restart KDE."
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
|
|
||||||
echo ""
|
|
||||||
echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
|
|
||||||
echo "was not included. Therefore, GCC symbol visibility support remains disabled."
|
|
||||||
echo ""
|
|
||||||
echo "For better performance, consider including the Qt visibility supporting patch"
|
|
||||||
echo "located at:"
|
|
||||||
echo ""
|
|
||||||
echo "http://bugs.kde.org/show_bug.cgi?id=109386"
|
|
||||||
echo ""
|
|
||||||
echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
|
|
||||||
echo "everything will continue to work just fine without it."
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$all_tests" = "bad"; then
|
|
||||||
if test ! "$cache_file" = "/dev/null"; then
|
|
||||||
echo ""
|
|
||||||
echo "Please remove the file $cache_file after changing your setup"
|
|
||||||
echo "so that configure will find the changes next time."
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
echo "Good - your configure finished. Start make now"
|
|
||||||
echo ""
|
|
||||||
fi
|
|
@ -1,566 +0,0 @@
|
|||||||
#MIN_CONFIG(3.3.5)
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE(tork, 0.1)
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
AC_CHECK_KDEMAXPATHLEN
|
|
||||||
|
|
||||||
# ---- Taken from KOffice ----------------------
|
|
||||||
# --- Check for KDE 3.2 or 3.3 or 3.4 or 3.5 ---
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for KDE version])
|
|
||||||
|
|
||||||
AC_LANG_SAVE
|
|
||||||
AC_LANG_CPLUSPLUS
|
|
||||||
tdeversion_save_CXXFLAGS="$CXXFLAGS"
|
|
||||||
tdeversion_safe_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
|
||||||
CXXFLAGS="$CXXFLAGS $all_includes"
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
|
|
||||||
#error KDE 3.2
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde32_compat="no"
|
|
||||||
,
|
|
||||||
need_kde32_compat="yes"
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
|
|
||||||
#error KDE 3.3
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde33_compat="no"
|
|
||||||
,
|
|
||||||
need_kde33_compat="yes"
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
|
|
||||||
#error KDE 3.4
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde34_compat="no"
|
|
||||||
,
|
|
||||||
need_kde34_compat="yes"
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
#include <tdeversion.h>
|
|
||||||
#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
|
|
||||||
#error KDE 3.5.x (x < 2)
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
need_kde351_compat="no"
|
|
||||||
,
|
|
||||||
need_kde351_compat="yes"
|
|
||||||
)
|
|
||||||
CXXFLAGS="$tdeversion_save_CXXFLAGS"
|
|
||||||
LIBS="$tdeversion_safe_LIBS"
|
|
||||||
AC_LANG_RESTORE
|
|
||||||
|
|
||||||
if test "$need_kde32_compat" = "yes"; then
|
|
||||||
AC_MSG_ERROR([You have KDE 3.2.x. TorK needs KDE 3.5.1 or greater.])
|
|
||||||
else
|
|
||||||
if test "$need_kde33_compat" = "yes"; then
|
|
||||||
AC_MSG_ERROR([You have KDE 3.3.x TorK needs KDE 3.5.1 or greater.])
|
|
||||||
else
|
|
||||||
if test "$need_kde34_compat" = "yes"; then
|
|
||||||
AC_MSG_ERROR([You have KDE 3.4.x TorK needs KDE 3.5.1 or greater.])
|
|
||||||
else
|
|
||||||
if test "$need_kde351_compat" = "yes"; then
|
|
||||||
AC_MSG_RESULT([KDE 3.5.x (x >=1) or SVN trunk])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# --- End KDE 3.2 check ---
|
|
||||||
|
|
||||||
# --- Begin libgnutls macro ---
|
|
||||||
|
|
||||||
dnl Autoconf macros for libgnutls
|
|
||||||
dnl $id$
|
|
||||||
|
|
||||||
# Modified for LIBGNUTLS -- nmav
|
|
||||||
# Configure paths for LIBGCRYPT
|
|
||||||
# Shamelessly stolen from the one of XDELTA by Owen Taylor
|
|
||||||
# Werner Koch 99-12-09
|
|
||||||
|
|
||||||
dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
|
||||||
dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_LIBGNUTLS],
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from the libgnutls-config script
|
|
||||||
dnl
|
|
||||||
AC_ARG_WITH(libgnutls-prefix,
|
|
||||||
[ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
|
|
||||||
libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
|
|
||||||
|
|
||||||
if test x$libgnutls_config_prefix != x ; then
|
|
||||||
if test x${LIBGNUTLS_CONFIG+set} != xset ; then
|
|
||||||
LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
|
|
||||||
min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
|
|
||||||
AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
|
|
||||||
no_libgnutls=""
|
|
||||||
if test "$LIBGNUTLS_CONFIG" = "no" ; then
|
|
||||||
no_libgnutls=yes
|
|
||||||
else
|
|
||||||
LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
|
|
||||||
LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
|
|
||||||
libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
|
|
||||||
|
|
||||||
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
|
|
||||||
LIBS="$LIBS $LIBGNUTLS_LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed libgnutls is sufficiently new. Also sanity
|
|
||||||
dnl checks the results of libgnutls-config to some extent
|
|
||||||
dnl
|
|
||||||
rm -f conf.libgnutlstest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <gnutls/gnutls.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
system ("touch conf.libgnutlstest");
|
|
||||||
|
|
||||||
if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
|
|
||||||
{
|
|
||||||
printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
|
|
||||||
"$libgnutls_config_version", gnutls_check_version(NULL) );
|
|
||||||
printf("*** was found! If libgnutls-config was correct, then it is best\n");
|
|
||||||
printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
|
|
||||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
||||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
||||||
printf("*** required on your system.\n");
|
|
||||||
printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
|
|
||||||
printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
|
|
||||||
printf("*** before re-running configure\n");
|
|
||||||
}
|
|
||||||
else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
|
|
||||||
{
|
|
||||||
printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
|
|
||||||
printf("*** library (version %s)\n", gnutls_check_version(NULL) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( gnutls_check_version( "$min_libgnutls_version" ) )
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
|
|
||||||
gnutls_check_version(NULL) );
|
|
||||||
printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
|
|
||||||
"$min_libgnutls_version" );
|
|
||||||
printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
|
|
||||||
printf("*** \n");
|
|
||||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
||||||
printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
|
|
||||||
printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
|
|
||||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
||||||
printf("*** so that the correct libraries are found at run-time))\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$no_libgnutls" = x ; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
if test -f conf.libgnutlstest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
fi
|
|
||||||
if test "$LIBGNUTLS_CONFIG" = "no" ; then
|
|
||||||
echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
|
|
||||||
echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
|
|
||||||
echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
|
|
||||||
echo "*** full path to libgnutls-config."
|
|
||||||
else
|
|
||||||
if test -f conf.libgnutlstest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run libgnutls test program, checking why..."
|
|
||||||
CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
|
|
||||||
LIBS="$LIBS $LIBGNUTLS_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <gnutls/gnutls.h>
|
|
||||||
], [ return !!gnutls_check_version(NULL); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
|
|
||||||
echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
|
|
||||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
||||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
||||||
echo "*** is required on your system"
|
|
||||||
echo "***"
|
|
||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
||||||
echo "***" ],
|
|
||||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
|
|
||||||
echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
|
|
||||||
echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
LIBGNUTLS_CFLAGS=""
|
|
||||||
LIBGNUTLS_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
rm -f conf.libgnutlstest
|
|
||||||
AC_SUBST(LIBGNUTLS_CFLAGS)
|
|
||||||
AC_SUBST(LIBGNUTLS_LIBS)
|
|
||||||
])
|
|
||||||
|
|
||||||
# --- End libgnutls macro ---
|
|
||||||
|
|
||||||
|
|
||||||
dnl Compile with GNUTLS
|
|
||||||
AC_ARG_ENABLE(gnutls,
|
|
||||||
AS_HELP_STRING(--enable-gnutls, Compile with GnuTLS))
|
|
||||||
|
|
||||||
if test x$enable_gnutls = xyes; then
|
|
||||||
|
|
||||||
# gnu tls
|
|
||||||
#AM_PATH_LIBGNUTLS(1.0.0, , [
|
|
||||||
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], , [
|
|
||||||
AC_DEFINE(USE_OPENSSL, 1, [use openssl for ssl session decryption instead of gnutls])
|
|
||||||
AC_SUBST(USE_OPENSSL)
|
|
||||||
])
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- If no gnutls check for openssl ---
|
|
||||||
|
|
||||||
if test "x$LIBGNUTLS_LIBS" = "x"; then
|
|
||||||
|
|
||||||
AC_DEFINE(USE_OPENSSL, 1, [use openssl for ssl session decryption instead of gnutls])
|
|
||||||
AC_SUBST(USE_OPENSSL)
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- End of If no gnutls check for openssl ---
|
|
||||||
|
|
||||||
# Even if gnutls is required, we still need openssl for shallot.
|
|
||||||
|
|
||||||
dnl ------------------------------------------------------
|
|
||||||
dnl Where do you live, openssl? And how do we call you?
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssl_dir, [
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
saved_LDFLAGS="$LDFLAGS"
|
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
|
||||||
ssl_found=no
|
|
||||||
for ssldir in $tryssldir "" $prefix /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /usr/pkg /opt /opt/openssl ; do
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
SSL_LIBS="-lssl -lcrypto"
|
|
||||||
LIBS="$saved_LIBS $SSL_LIBS"
|
|
||||||
|
|
||||||
# Skip the directory if it isn't there.
|
|
||||||
if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
|
|
||||||
continue;
|
|
||||||
fi
|
|
||||||
if test ! -z "$ssldir" ; then
|
|
||||||
if test -d "$ssldir/lib" ; then
|
|
||||||
LDFLAGS="-L$ssldir/lib $LDFLAGS"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L$ssldir $LDFLAGS"
|
|
||||||
fi
|
|
||||||
if test -d "$ssldir/include" ; then
|
|
||||||
CPPFLAGS="-I$ssldir/include $CPPFLAGS"
|
|
||||||
else
|
|
||||||
CPPFLAGS="-I$ssldir $CPPFLAGS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# Can I link it?
|
|
||||||
AC_TRY_LINK([#include <openssl/rand.h>],
|
|
||||||
[ RAND_add((void*)0,0,0); ],
|
|
||||||
[ openssl_linked=yes ], [ openssl_linked=no ])
|
|
||||||
if test $openssl_linked = yes; then
|
|
||||||
if test ! -z "$ssldir" ; then
|
|
||||||
ac_cv_openssl_dir=$ssldir
|
|
||||||
else
|
|
||||||
ac_cv_openssl_dir="(system)"
|
|
||||||
fi
|
|
||||||
ssl_found=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
LIBS="$saved_LIBS"
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
CPPFLAGS="$saved_CPPFLAGS"
|
|
||||||
if test $ssl_found = no ; then
|
|
||||||
AC_MSG_ERROR([Could not find a linkable OpenSSL. You can specify an explicit path using --with-ssl-dir])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
SSL_LIBS="-lssl -lcrypto"
|
|
||||||
LIBS="$saved_LIBS $SSL_LIBS"
|
|
||||||
|
|
||||||
if test "$ac_cv_openssl_dir" != "(system)"; then
|
|
||||||
if test -d "$ac_cv_openssl_dir/lib" ; then
|
|
||||||
LDFLAGS="-L$ac_cv_openssl_dir/lib $LDFLAGS"
|
|
||||||
ssl_libdir="$ac_cv_openssl_dir/lib"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L$ac_cv_openssl_dir $LDFLAGS"
|
|
||||||
ssl_libdir="$ac_cv_openssl_dir"
|
|
||||||
fi
|
|
||||||
if test -d "$ac_cv_openssl_dir/include" ; then
|
|
||||||
CPPFLAGS="-I$ac_cv_openssl_dir/include $CPPFLAGS"
|
|
||||||
else
|
|
||||||
CPPFLAGS="-I$ac_cv_openssl_dir $CPPFLAGS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([whether we need extra options to link OpenSSL],
|
|
||||||
ac_cv_openssl_linker_option, [
|
|
||||||
saved_LDFLAGS="$LDFLAGS"
|
|
||||||
ssl_runs=no
|
|
||||||
linked_with=nothing
|
|
||||||
for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do
|
|
||||||
LDFLAGS="$ssl_extra $saved_LDFLAGS"
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <string.h>
|
|
||||||
#include <openssl/rand.h>
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
char a[2048];
|
|
||||||
memset(a, 0, sizeof(a));
|
|
||||||
RAND_add(a, sizeof(a), sizeof(a));
|
|
||||||
return(RAND_status() <= 0);
|
|
||||||
}
|
|
||||||
],
|
|
||||||
openssl_runs=yes, openssl_runs=no)
|
|
||||||
if test $openssl_runs = yes ; then
|
|
||||||
if test "$linked_with" = nothing; then
|
|
||||||
linked_with="$ssl_extra"
|
|
||||||
fi
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <openssl/opensslv.h>
|
|
||||||
#include <openssl/crypto.h>
|
|
||||||
int main(void) {
|
|
||||||
return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0;
|
|
||||||
}],
|
|
||||||
right_version=yes, right_version=no)
|
|
||||||
if test "$right_version" = yes; then
|
|
||||||
if test -z "$ssl_extra" ; then
|
|
||||||
ac_cv_openssl_linker_option='(none)'
|
|
||||||
else
|
|
||||||
ac_cv_openssl_linker_option=$ssl_extra
|
|
||||||
fi
|
|
||||||
ssl_runs=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test $ssl_runs = no ; then
|
|
||||||
if test "$linked_with" = 'nothing' ; then
|
|
||||||
AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?])
|
|
||||||
else
|
|
||||||
if test -z "$linked_with" ; then
|
|
||||||
ac_cv_openssl_linker_option='(none)'
|
|
||||||
else
|
|
||||||
ac_cv_openssl_linker_option=$linked_with
|
|
||||||
fi
|
|
||||||
AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
])
|
|
||||||
|
|
||||||
if test "$ac_cv_openssl_linker_option" != '(none)' ; then
|
|
||||||
LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LIBS="$saved_LIBS"
|
|
||||||
|
|
||||||
# --- Decide which library to use for linking Tork ---
|
|
||||||
# --- SSL will be used for shallot ---
|
|
||||||
|
|
||||||
if test "x$LIBGNUTLS_LIBS" = "x"; then
|
|
||||||
CRYPTO_LIBS=$SSL_LIBS
|
|
||||||
else
|
|
||||||
CRYPTO_LIBS=$LIBGNUTLS_LIBS
|
|
||||||
fi
|
|
||||||
AC_SUBST(CRYPTO_LIBS)
|
|
||||||
AC_SUBST(SSL_LIBS)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dnl - GeoIP
|
|
||||||
|
|
||||||
AC_ARG_WITH(external-geoip,
|
|
||||||
AC_HELP_STRING([--with-external-geoip], [Build against an external copy of GeoIP]))
|
|
||||||
|
|
||||||
if test "x$with_external_geoip" != "xyes"; then
|
|
||||||
GEOVERSION=1.4.2
|
|
||||||
dnl PACKAGE=GeoIP
|
|
||||||
GEOIP_VERSION_INFO=`echo $GEOVERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
|
|
||||||
AC_SUBST(GEOIP_VERSION_INFO)
|
|
||||||
|
|
||||||
AC_ARG_WITH(city,
|
|
||||||
[ --with-city=\"no\" Enable/disable support for GeoIP City Edition. (yes)])
|
|
||||||
if test "$with_city" = "no" ; then
|
|
||||||
echo Disabling GeoIP City Edition support
|
|
||||||
WITH_CITY=1
|
|
||||||
else
|
|
||||||
echo Enabling GeoIP City Edition support
|
|
||||||
WITH_CITY=0
|
|
||||||
fi
|
|
||||||
AC_SUBST(WITH_CITY)
|
|
||||||
else
|
|
||||||
with_city=no
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS([GeoIP.h],,
|
|
||||||
[AC_MSG_ERROR([External GeoIP requested but GeoIP not found.])])
|
|
||||||
AC_CHECK_LIB([GeoIP], [GeoIP_new], [GEOIPLIB=-lGeoIP],
|
|
||||||
[AC_MSG_ERROR([External GeoIP requested but GeoIP not found.])])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL(WITH_CITY, test "$with_city" != "no")
|
|
||||||
AM_CONDITIONAL([EXTERNAL_GEOIP], [test "x$with_external_geoip" = "xyes"])
|
|
||||||
|
|
||||||
if test x$with_external_geoip = xyes; then
|
|
||||||
AC_DEFINE(EXTERNAL_GEOIP, 1, "Using External GeoIP")
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dnl - libwhich
|
|
||||||
|
|
||||||
which_cv_iberty=no
|
|
||||||
AC_ARG_ENABLE(iberty,
|
|
||||||
[ --disable-iberty do not try to find and use the iberty library],
|
|
||||||
which_cv_iberty=$enableval)
|
|
||||||
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_PROG_INSTALL
|
|
||||||
AC_LANG_C
|
|
||||||
|
|
||||||
|
|
||||||
AC_DEFUN([BASH_CHECK_GETPW_FUNCS],
|
|
||||||
[AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
|
|
||||||
AC_CACHE_VAL(bash_cv_can_redecl_getpw,
|
|
||||||
[AC_TRY_COMPILE([#include <sys/types.h>
|
|
||||||
#include <pwd.h>
|
|
||||||
extern struct passwd *getpwent();
|
|
||||||
extern struct passwd *getpwuid();
|
|
||||||
extern struct passwd *getpwnam();],
|
|
||||||
[struct passwd *z; z = getpwent(); z = getpwuid(0); z = getpwnam("root");],
|
|
||||||
bash_cv_can_redecl_getpw=yes,bash_cv_can_redecl_getpw=no)])
|
|
||||||
AC_MSG_RESULT($bash_cv_can_redecl_getpw)
|
|
||||||
if test $bash_cv_can_redecl_getpw = no; then
|
|
||||||
AC_DEFINE([HAVE_GETPW_DECLS], 1, [Define this when you are able to redeclare getpw functions.])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
dnl Checks for header files.
|
|
||||||
AC_HEADER_STDC
|
|
||||||
AC_CHECK_FUNCS(strchr memcpy getopt_long)
|
|
||||||
AC_CHECK_HEADERS(unistd.h string.h libiberty.h)
|
|
||||||
AC_HEADER_STAT
|
|
||||||
|
|
||||||
AC_HEADER_TIME
|
|
||||||
AC_CHECK_HEADERS(sys/time.h)
|
|
||||||
|
|
||||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
||||||
AC_C_CONST
|
|
||||||
AC_TYPE_SIZE_T
|
|
||||||
|
|
||||||
dnl Checks for library functions.
|
|
||||||
AC_TYPE_GETGROUPS
|
|
||||||
AC_CHECK_FUNCS(getcwd getwd)
|
|
||||||
|
|
||||||
AC_DEFINE([NEED_XMALLOC], 1, [Define if you need xmalloc().])
|
|
||||||
|
|
||||||
dnl Additional stuff needed for the tilde directory
|
|
||||||
AC_CHECK_PROG(AR, ar, ar, ar)
|
|
||||||
AC_PROG_RANLIB
|
|
||||||
AC_CHECK_HEADERS(stdlib.h)
|
|
||||||
BASH_CHECK_GETPW_FUNCS
|
|
||||||
|
|
||||||
if test "x$CONFDIR" = "x"; then
|
|
||||||
CONFDIR=`eval echo $sysconfdir`
|
|
||||||
fi
|
|
||||||
AC_SUBST(CONFDIR)
|
|
||||||
AH_TEMPLATE([CONFDIR],[tork's configuration directory])
|
|
||||||
AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR")
|
|
||||||
|
|
||||||
|
|
||||||
dnl Disable stuff that's not suitable for a Live CD
|
|
||||||
AC_ARG_ENABLE(live-cd,
|
|
||||||
AS_HELP_STRING(--enable-live-cd, Disable Features Unsuitable for LiveCD))
|
|
||||||
|
|
||||||
if test x$enable_live_cd = xyes; then
|
|
||||||
AC_DEFINE(LIVECD, 1, "Define to compile for a LiveCD")
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Detect OS for Shallot compilation
|
|
||||||
|
|
||||||
case "$host" in
|
|
||||||
*-*-linux*) AC_DEFINE(LINUX_PORT, 1, "Shallot will compile for Linux") ;;
|
|
||||||
*-*-freebsd*) AC_DEFINE(BSD, 1, "Shallot will compile for BSD") ;;
|
|
||||||
*-*-netbsd*) AC_DEFINE(BSD, 1, "Shallot will compile for BSD") ;;
|
|
||||||
*-*-openbsd*) AC_DEFINE(BSD, 1, "Shallot will compile for BSD") ;;
|
|
||||||
*) AC_DEFINE(GENERIC, 1, "Shallot will compile for GENERIC") ;;
|
|
||||||
esac
|
|
||||||
#AC_DEFINE(_GNU_SOURCE, 1, "Shallot will compile with _GNU_SOURCE")
|
|
||||||
# USE_GNU_SOURCE above is used instead and _GNU_SOURCE defined in shallot.
|
|
||||||
|
|
||||||
dnl Check for presence of torsocks
|
|
||||||
AC_CHECK_PROG(TORSOCKS, torsocks, torsocks)
|
|
||||||
if test "${TORSOCKS}" = ""; then
|
|
||||||
AC_MSG_ERROR('TorK requires torsocks: http://code.google.com/p/torsocks')
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl detect netfilter
|
|
||||||
AC_CHECK_HEADERS(sys/types.h sys/socket.h)
|
|
||||||
AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
|
|
||||||
linux_netfilter_ipv4=1, linux_netfilter_ipv4=0)
|
|
||||||
|
|
||||||
|
|
||||||
failsafe_ok=0
|
|
||||||
if test x$linux_netfilter_ipv4 = x1 ; then
|
|
||||||
failsafe_ok=1
|
|
||||||
fi
|
|
||||||
if test x$failsafe_ok = x1 ; then
|
|
||||||
AC_DEFINE(USE_FAILSAFE, 1, "Define to enable failsafe support")
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([src/menu/tork])
|
|
@ -1,21 +0,0 @@
|
|||||||
export CVS_RSH=ssh
|
|
||||||
export VN=0.33
|
|
||||||
export VER=tork-$VN
|
|
||||||
export TAG=v0_33
|
|
||||||
cd ..
|
|
||||||
TOPDIR=$PWD
|
|
||||||
cd TorkReleases
|
|
||||||
INSTALLDIR=$PWD
|
|
||||||
|
|
||||||
|
|
||||||
#create source package
|
|
||||||
cvs -z3 -d:ext:hoganrobert@tork.cvs.sourceforge.net:/cvsroot/tork export -r $TAG tork
|
|
||||||
cd tork
|
|
||||||
make -f Makefile.cvs
|
|
||||||
rm -rf autom4te.cache
|
|
||||||
cd ..
|
|
||||||
mv tork $VER
|
|
||||||
tar jcvf $VER.tar.bz2 $VER
|
|
||||||
tar zcvf $VER.tar.gz $VER
|
|
||||||
gpg -sba $VER.tar.bz2
|
|
||||||
gpg -sba $VER.tar.gz
|
|
@ -1,6 +0,0 @@
|
|||||||
# the SUBDIRS is filled automatically by am_edit. If files are
|
|
||||||
# in this directory they are installed into the english dir
|
|
||||||
|
|
||||||
KDE_LANG = en
|
|
||||||
KDE_DOCS = tork
|
|
||||||
SUBDIRS = $(AUTODIRS)
|
|
@ -1,2 +0,0 @@
|
|||||||
KDE_DOCS = tork
|
|
||||||
KDE_LANG = en
|
|
@ -1 +0,0 @@
|
|||||||
POFILES = AUTO
|
|
@ -1,10 +0,0 @@
|
|||||||
NULL =
|
|
||||||
|
|
||||||
INCLUDES = -Wall -ansi
|
|
||||||
|
|
||||||
SUBDIRS = \
|
|
||||||
data \
|
|
||||||
libGeoIP \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
EXTRA_DIST = READMEwin32.txt GeoIPWinDLL.patch TODO bootstrap GeoIP.spec GeoIP.spec.in
|
|
@ -1,7 +0,0 @@
|
|||||||
METASOURCES = AUTO
|
|
||||||
|
|
||||||
geotorkdatadir = $(kde_datadir)/tork/geoip
|
|
||||||
|
|
||||||
GEOIP_FILES = GeoIP.dat GeoIP-LICENSE.txt
|
|
||||||
|
|
||||||
geotorkdata_DATA = $(GEOIP_FILES)
|
|
@ -1,17 +0,0 @@
|
|||||||
noinst_LTLIBRARIES = libGeoIP.la libGeoIPUpdate.la
|
|
||||||
|
|
||||||
EXTRA_DIST = md5.h global.h types.h GeoIP_internal.h
|
|
||||||
|
|
||||||
AM_CPPFLAGS = -DGEOIPDATADIR=\"$(pkgdatadir)\" -Wall
|
|
||||||
|
|
||||||
if WITH_CITY
|
|
||||||
libGeoIP_la_SOURCES = GeoIP.c GeoIPCity.c regionName.c timeZone.c
|
|
||||||
else
|
|
||||||
libGeoIP_la_SOURCES = GeoIP.c regionName.c timeZone.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
libGeoIPUpdate_la_SOURCES = GeoIPUpdate.c md5.c
|
|
||||||
|
|
||||||
#libGeoIP_la_LDFLAGS = -version-info @GEOIP_VERSION_INFO@
|
|
||||||
|
|
||||||
libGeoIPUpdate_la_LIBADD = -lz libGeoIP.la
|
|
@ -1,92 +0,0 @@
|
|||||||
## Makefile.am for tork
|
|
||||||
|
|
||||||
# this is the program that gets installed. it's name is used for all
|
|
||||||
# of the other Makefile.am variables
|
|
||||||
bin_PROGRAMS = tork
|
|
||||||
|
|
||||||
if EXTERNAL_GEOIP
|
|
||||||
geoiplib=-lGeoIP
|
|
||||||
geoipdir=
|
|
||||||
else
|
|
||||||
geoiplib=GeoIP-1.4.0/libGeoIP/libGeoIP.la
|
|
||||||
geoipdir=GeoIP-1.4.0
|
|
||||||
endif
|
|
||||||
|
|
||||||
SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \
|
|
||||||
menu scripts upnp .
|
|
||||||
# torkapplet konqplugin tor_ioslave - removed from build
|
|
||||||
|
|
||||||
DISTCLEANFILES=dcoptork.kidl
|
|
||||||
|
|
||||||
# set the include path for X, qt and TDE
|
|
||||||
INCLUDES = $(all_includes)
|
|
||||||
|
|
||||||
# let automoc handle all of the meta source files (moc)
|
|
||||||
METASOURCES = AUTO
|
|
||||||
|
|
||||||
# the library search path.
|
|
||||||
tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
|
||||||
|
|
||||||
# the libraries to link against.
|
|
||||||
tork_LDADD = $(LIB_TDEIO) $(LIB_KFILE) $(LIB_TDEHTML) $(geoiplib) $(LIB_TDEUI) $(LIB_TDECORE) -lDCOP $(LIB_TQT) \
|
|
||||||
upnp/libktupnp.la $(CRYPTO_LIBS)
|
|
||||||
|
|
||||||
# which sources should be compiled for tork
|
|
||||||
tork_SOURCES = chart.cpp configdialog.cpp crashhandler.cpp \
|
|
||||||
crypto.cpp dcoptork.kidl dcoptork.skel dndlistview.cpp firewallsproxies.ui \
|
|
||||||
functions.cpp hiddensrvs.ui hidsrvwizard.ui hitwidget.cpp hitwidget_layout.ui \
|
|
||||||
introwizard.ui kerrylabel.cpp konqueror.ui kwidgetlistbox.cpp likeback.cpp main.cpp \
|
|
||||||
maxmin.ui mixminion.ui newfirstrunwizard.ui newstreamosd.cpp overlayWidget.cpp \
|
|
||||||
paranoia.ui popupMessage.cpp quickconfig.ui running.ui server.ui serverwizard.ui \
|
|
||||||
statgraph.cpp testprivacyproxy.cpp torclient.cpp tork.cpp torkactivelabel.cpp \
|
|
||||||
torkconfig.kcfgc torkview.cpp torkview_base.ui torservers.ui trayhoverpopup.cpp \
|
|
||||||
trayicon.cpp update.cpp upnpmanager.cpp usability.ui
|
|
||||||
|
|
||||||
xdg_apps_DATA = tork.desktop
|
|
||||||
kde_kcfg_DATA = torkconfig.kcfg
|
|
||||||
|
|
||||||
# these are the headers for your project
|
|
||||||
noinst_HEADERS = crypto.h dcoptork.h likeback.h likeback_private.h \
|
|
||||||
update.h warnings.h
|
|
||||||
|
|
||||||
|
|
||||||
messages: rc.cpp
|
|
||||||
$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
|
|
||||||
$(XGETTEXT) *.h *.cpp -o $(podir)/tork.pot
|
|
||||||
|
|
||||||
KDE_ICON = \
|
|
||||||
cr16-app-tork.png \
|
|
||||||
cr22-app-tork.png \
|
|
||||||
cr32-app-tork.png \
|
|
||||||
cr48-app-tork.png \
|
|
||||||
cr64-app-tork.png \
|
|
||||||
cr128-app-tork.png \
|
|
||||||
hi16-app-tork_old.png \
|
|
||||||
hi32-app-tork_old.png \
|
|
||||||
crsc-app-tork.svg \
|
|
||||||
\
|
|
||||||
cr16-action-likeback_configure_tork.png \
|
|
||||||
cr16-action-likeback_dislike_tork.png \
|
|
||||||
cr16-action-likeback_feature_tork.png \
|
|
||||||
cr16-action-likeback_bug_tork.png \
|
|
||||||
cr16-action-likeback_like_tork.png
|
|
||||||
|
|
||||||
# this is where the servicemenu file will go
|
|
||||||
konqservice_DATA = tork_downloadwithfirefox.desktop tork_downloadwithopera.desktop \
|
|
||||||
tork_downloadwithkonqueror.desktop
|
|
||||||
konqservicedir = $(kde_datadir)/konqueror/servicemenus
|
|
||||||
|
|
||||||
# this is where the XML-GUI resource file goes
|
|
||||||
rcdir = $(kde_datadir)/tork
|
|
||||||
rc_DATA = torkui.rc
|
|
||||||
|
|
||||||
eventsrcdir = $(kde_datadir)/tork
|
|
||||||
eventsrc_DATA = eventsrc
|
|
||||||
|
|
||||||
manpagedir = $(mandir)/man1
|
|
||||||
manpage_DATA = tork.1
|
|
||||||
|
|
||||||
pixmapdir = $(prefix)/share/pixmaps
|
|
||||||
pixmap_DATA = tork.xpm
|
|
||||||
|
|
||||||
main.o : usability.h torservers.h torkview_base.h maxmin.h running.h torkconfig.h firewallsproxies.h server.h quickconfig.h newfirstrunwizard.h hiddensrvs.h hidsrvwizard.h konqueror.h introwizard.h paranoia.h
|
|
@ -1,40 +0,0 @@
|
|||||||
bin_PROGRAMS = torkarkollon
|
|
||||||
torkarkollon_SOURCES = torkarkollon.cpp \
|
|
||||||
wizard.cpp \
|
|
||||||
rcparser.cpp \
|
|
||||||
uninstallwizard.cpp \
|
|
||||||
headerlistitem.cpp \
|
|
||||||
data.cpp \
|
|
||||||
logdialog.ui \
|
|
||||||
wizardbase.ui
|
|
||||||
|
|
||||||
|
|
||||||
noinst_HEADERS = data.h \
|
|
||||||
headerlistitem.h \
|
|
||||||
rcparser.h \
|
|
||||||
uninstallwizard.h \
|
|
||||||
wizard.h \
|
|
||||||
logdialog.h \
|
|
||||||
wizardbase.h
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# set the include path found by configure
|
|
||||||
INCLUDES= $(all_includes)
|
|
||||||
# the library search path.
|
|
||||||
torkarkollon_LDFLAGS = $(all_libraries)
|
|
||||||
LIBS =
|
|
||||||
#torkarkollon_LDFLAGS =
|
|
||||||
#torkarkollon_LDADD = $(LIB_TQT) $(LIB_KFILE)
|
|
||||||
torkarkollon_LDADD = $(LIB_KFILE) $(LIB_TQT) $(LIB_TDECORE)
|
|
||||||
|
|
||||||
# let automoc handle all of the meta source files (moc)
|
|
||||||
METASOURCES = AUTO
|
|
||||||
|
|
||||||
manpagedir = $(mandir)/man1
|
|
||||||
manpage_DATA = torkarkollon.1
|
|
||||||
|
|
||||||
torkarkollon.o : wizardbase.h logdialog.h
|
|
||||||
wizard.o : wizardbase.h logdialog.h
|
|
||||||
uninstallwizard.o : wizardbase.h logdialog.h
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
|||||||
KDE_ICON = tork
|
|
||||||
|
|
||||||
pics_ICON = AUTO
|
|
||||||
picsdir = $(kde_datadir)/tork/icons
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
INCLUDES = $(all_includes)
|
|
||||||
|
|
||||||
kde_module_LTLIBRARIES = tdehtml_tork.la
|
|
||||||
|
|
||||||
tdehtml_tork_la_METASOURCES = AUTO
|
|
||||||
tdehtml_tork_la_SOURCES = tork_plug_in.cpp
|
|
||||||
tdehtml_tork_la_LIBADD = $(LIB_TDEHTML)
|
|
||||||
tdehtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
|
||||||
|
|
||||||
KDE_ICON = AUTO
|
|
||||||
|
|
||||||
part_DATA = tork_plug_in.rc tork_plug_in.desktop
|
|
||||||
partdir = $(kde_datadir)/tdehtml/kpartplugins
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
menudir = $(prefix)/share/menu
|
|
||||||
menu_DATA = tork
|
|
@ -1,34 +0,0 @@
|
|||||||
privoxy_DATA = \
|
|
||||||
blocked \
|
|
||||||
cgi-error-404 \
|
|
||||||
cgi-error-bad-param \
|
|
||||||
cgi-error-disabled \
|
|
||||||
cgi-error-file \
|
|
||||||
cgi-error-modified \
|
|
||||||
cgi-error-parse \
|
|
||||||
cgi-style.css \
|
|
||||||
connect-failed \
|
|
||||||
default \
|
|
||||||
edit-actions-add-url-form \
|
|
||||||
edit-actions-for-url \
|
|
||||||
edit-actions-for-url-filter \
|
|
||||||
edit-actions-list \
|
|
||||||
edit-actions-list-section \
|
|
||||||
edit-actions-list-url \
|
|
||||||
edit-actions-remove-url-form \
|
|
||||||
edit-actions-url-form \
|
|
||||||
mod-local-help \
|
|
||||||
mod-support-and-service \
|
|
||||||
mod-title \
|
|
||||||
mod-unstable-warning \
|
|
||||||
no-such-domain \
|
|
||||||
show-request \
|
|
||||||
show-status \
|
|
||||||
show-status-file \
|
|
||||||
show-url-info \
|
|
||||||
show-version \
|
|
||||||
toggle \
|
|
||||||
toggle-mini \
|
|
||||||
untrusted
|
|
||||||
|
|
||||||
privoxydir = $(kde_datadir)/tork/privoxy/templates
|
|
@ -1,3 +0,0 @@
|
|||||||
scripts_SCRIPTS = usewithtor
|
|
||||||
scriptsdir = $(kde_bindir)
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
|||||||
INCLUDES = $(all_includes)
|
|
||||||
LIBS =
|
|
||||||
|
|
||||||
kde_module_LTLIBRARIES = tdeio_torioslave.la
|
|
||||||
|
|
||||||
tdeio_torioslave_la_SOURCES = torioslave.cpp
|
|
||||||
tdeio_torioslave_la_LIBADD = -ltdeio
|
|
||||||
tdeio_torioslave_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
|
|
||||||
|
|
||||||
protocol_DATA = torioslave.protocol
|
|
||||||
protocoldir = $(kde_servicesdir)
|
|
||||||
|
|
||||||
messages: rc.cpp
|
|
||||||
$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
|
|
||||||
$(XGETTEXT) *.cpp -o $(podir)/tdeio_torioslave.pot
|
|
@ -1,17 +0,0 @@
|
|||||||
INCLUDES = $(all_includes)
|
|
||||||
LIBS =
|
|
||||||
|
|
||||||
kde_module_LTLIBRARIES = kickermenu_tork.la
|
|
||||||
|
|
||||||
kickermenu_tork_la_SOURCES = tork_mnu.cpp ../functions.cpp
|
|
||||||
kickermenu_tork_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
||||||
kickermenu_tork_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDECORE) -lDCOP $(LIB_TQT)
|
|
||||||
|
|
||||||
kickermenu_tork_la_METASOURCES = AUTO
|
|
||||||
|
|
||||||
desktopmenu_DATA = torkmenu.desktop
|
|
||||||
desktopmenudir = $(kde_datadir)/kicker/menuext
|
|
||||||
|
|
||||||
messages:
|
|
||||||
$(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tork.pot
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
METASOURCES = AUTO
|
|
||||||
INCLUDES = $(all_includes)
|
|
||||||
|
|
||||||
libktupnp_la_LDFLAGS = $(all_libraries)
|
|
||||||
noinst_LTLIBRARIES = libktupnp.la
|
|
||||||
libktupnp_la_SOURCES = soap.cpp upnpdescriptionparser.cpp upnpmcastsocket.cpp \
|
|
||||||
upnprouter.cpp portlist.cpp httprequest.cpp exitoperation.cpp \
|
|
||||||
forwardportlist.cpp
|
|
||||||
|
|
||||||
noinst_HEADERS = upnpmcastsocket.h upnprouter.h \
|
|
||||||
upnpdescriptionparser.h soap.h
|
|
||||||
|
|
||||||
|
|
||||||
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
|
|
@ -1,19 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2006 by Robert Hogan *
|
|
||||||
* robert@roberthogan.net *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
@ -1,19 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2006 by Robert Hogan *
|
|
||||||
* robert@roberthogan.net *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
Loading…
Reference in new issue