diff --git a/Makefile.am b/Makefile.am index e67ff9d..630a1b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = build +SUBDIRS = build misc ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index e60f00b..df59b53 100644 --- a/configure.ac +++ b/configure.ac @@ -288,7 +288,12 @@ if test "x$GIT" != "xno"; then fi AC_SUBST(TOXIC_VERSION) +eval PACKAGE_DATADIR="${datadir}/${PACKAGE}" +eval PACKAGE_DATADIR="${PACKAGE_DATADIR}" +AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, "$PACKAGE_DATADIR", [toxic data directory]) + AC_CONFIG_FILES([Makefile + misc/Makefile build/Makefile]) AC_OUTPUT diff --git a/misc/DHTservers b/misc/DHTservers new file mode 100644 index 0000000..bf2d272 --- /dev/null +++ b/misc/DHTservers @@ -0,0 +1,9 @@ +192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858 +66.175.223.88 33445 AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D +192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143 +192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67 +81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269 +198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854 +95.47.140.214 33445 F4BF7C5A9D0EF4CB684090C38DE937FAE1612021F21FEA4DCBFAC6AAFEF58E68 +54.215.145.71 33445 6EDDEE2188EF579303C0766B4796DCBA89C93058B6032FEA51593DCD42FB746C +66.74.30.125 33445 7155386A691E7BD3C4C0589D70ACDA191D488634772885CCED5DD7B3F7E6310D diff --git a/misc/Makefile.am b/misc/Makefile.am new file mode 100644 index 0000000..c25600a --- /dev/null +++ b/misc/Makefile.am @@ -0,0 +1 @@ +dist_pkgdata_DATA = DHTservers diff --git a/src/main.c b/src/main.c index 543b7d0..6c31041 100644 --- a/src/main.c +++ b/src/main.c @@ -2,6 +2,10 @@ * Toxic -- Tox Curses Client */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #define _XOPEN_SOURCE_EXTENDED #include #include @@ -294,7 +298,7 @@ int main(int argc, char *argv[]) if (config_err) { DATA_FILE = strdup("data"); - SRVLIST_FILE = strdup("../../other/DHTservers"); + SRVLIST_FILE = strdup(PACKAGE_DATADIR "/DHTservers"); } else { DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); strcpy(DATA_FILE, user_config_dir);