summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac3
-rw-r--r--dev/Makefile.am5
-rw-r--r--src/userpref.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index bf4205d..04358f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src include fdi swig $(DEV_SUB) tools
+SUBDIRS = src include fdi swig dev tools
DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools
@@ -8,9 +8,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libiphone-1.0.pc
EXTRA_DIST= docs
-dist-hook: doc
-doc:
+docs:
rm -fr docs
doxygen doxygen.cfg
diff --git a/configure.ac b/configure.ac
index d6b27f4..55f5bae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,9 @@ if test "$build_dev_tools" = true; then
else
DEV_SUB=
fi
+
+AM_CONDITIONAL([ENABLE_DEVTOOLS],[test "x$DEV_SUB" = "xdev"])
+
AC_SUBST([DEV_SUB])
AC_ARG_ENABLE([debug-code],
diff --git a/dev/Makefile.am b/dev/Makefile.am
index c41b663..27b3380 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = -I$(top_srcdir)/include
AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS)
AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
+if ENABLE_DEVTOOLS
noinst_PROGRAMS = iphoneclient lckd-client afccheck msyncclient iphoneenterrecovery
iphoneclient_SOURCES = iphoneclient.c
@@ -27,3 +28,7 @@ iphoneenterrecovery_SOURCES = iphoneenterrecovery.c
iphoneenterrecovery_CFLAGS = $(AM_CFLAGS)
iphoneenterrecovery_LDFLAGS = $(AM_LDFLAGS)
iphoneenterrecovery_LDADD = ../src/libiphone.la
+
+endif # ENABLE_DEVTOOLS
+
+EXTRA_DIST = iphoneclient.c lckdclient.c afccheck.c msyncclient.c
diff --git a/src/userpref.c b/src/userpref.c
index b930693..9dd1a01 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -148,7 +148,7 @@ void userpref_get_host_id(char **host_id)
g_key_file_free(key_file);
g_free(config_file);
- if (!host_id) {
+ if (!*host_id) {
/* no config, generate host_id */
*host_id = userpref_generate_host_id();
userpref_set_host_id(*host_id);