summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 17:01:14 +0000
committerscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 17:01:14 +0000
commitc63efaf24e6b387989a69c9a38fb173220e79fcd (patch)
tree2e3f265d0c68f5f71641e1e6dc50e487193bef1c
parent6c4fe3323d79253af707df90623e433ce12c35f2 (diff)
- oprava browseni serveru
- pridano DDist=1 pro tvorbu binarky - oprava debug modu git-svn-id: http://opensvn.csie.org/tuxanci_ng@95 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
-rw-r--r--CMakeLists.txt13
-rw-r--r--config.h2
-rw-r--r--src/net/dns.c3
3 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6cea02..7195258 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,11 @@
# Created by Tomas Chvatal
# volani se vsemy externimy moznostmy:
-# cmake . -DNO_Server=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS="-Wall"
+# cmake . -DNO_Server=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS="-Wall -DDist=1"
# make
# make install
+# DDist=1 vyrobi binarku do adresare dist/ -> vhodne pro distribuci binarniho baliku...
# pri zmene zdrojovych souboru se podivejte co je treba delat do souboru
# CMakeLists.txt v adresari src
SET ( APPNAME "tuxanci-ng")
@@ -35,8 +36,10 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
# nazev projektu
PROJECT ( tuxanci )
# verbose nastaveni vypnout pred release
+IF ( Dist )
+ SET ( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/dist )
+ENDIF ( Dist )
IF ( Debug )
- set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/dist)
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
SET ( CMAKE_VERBOSE_MAKEFILE on )
@@ -57,9 +60,9 @@ ADD_SUBDIRECTORY ( src )
# data !TODO
#MESSAGE ( STATUS "<Installing datafiles>" )
#MESSAGE ( STATUS "<******************************>" )
-IF ( NOT CMAKE_INSTALL_DATADIR EQUAL "" )
+IF ( NOT CMAKE_INSTALL_DATADIR )
SET ( CMAKE_INSTALL_DATADIR share/ )
-ENDIF ( NOT CMAKE_INSTALL_DATADIR EQUAL "" )
+ENDIF ( CMAKE_INSTALL_DATADIR )
SET ( CMAKE_INSTALL_ETCDIR /etc )
INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci-ng.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/LICENCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
@@ -89,4 +92,4 @@ CONFIGURE_FILE(
IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall
- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") \ No newline at end of file
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
diff --git a/config.h b/config.h
index 6410134..5d5b99c 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
-#define TUXANCI_NG_VERSION "svn93"
+#define TUXANCI_NG_VERSION "svn95"
#define DESTDIR "/usr/local/"
diff --git a/src/net/dns.c b/src/net/dns.c
index a8e5030..0910a74 100644
--- a/src/net/dns.c
+++ b/src/net/dns.c
@@ -1,3 +1,6 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include <string.h>