fix compile if no system libUseful

Author: Colum Paget

Makefile

@@ -1,7 +1,7 @@
-OBJ=parse.o stats.o settings.o help.o
-FLAGS=-g -O2 -DPACKAGE_NAME=\"timediff\" -DPACKAGE_TARNAME=\"timediff\" -DPACKAGE_VERSION=\"1.0\" -DPACKAGE_STRING=\"timediff\ 1.0\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIBUSEFUL_5_LIBUSEFUL_H=1 -DHAVE_LIBUSEFUL_5=1
-LIBS=-lUseful-5 -lcap -lssl -lcrypto -lz 
-STATIC_LIBS=
+OBJ=parse.o stats.o settings.o help.o libUseful-5/libUseful.a
+FLAGS=-g -O2 -DPACKAGE_NAME=\"timediff\" -DPACKAGE_TARNAME=\"timediff\" -DPACKAGE_VERSION=\"1.0\" -DPACKAGE_STRING=\"timediff\ 1.0\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1
+LIBS=-lcap -lssl -lcrypto -lz 
+STATIC_LIBS=libUseful-5/libUseful.a
 PREFIX=/usr/local
 
 all: $(OBJ)
@@ -19,10 +19,12 @@ settings.o: settings.h settings.c
 help.o: help.h help.c
 	gcc $(FLAGS) -c help.c
 
+libUseful-5/libUseful.a:
+	make -C libUseful-5
 
 
 clean:
-	rm -rf timediff *.o *.orig
+	rm -rf timediff *.o */*.o */*.so */*.a *.orig
 
 
 install:

Makefile.in

@@ -1,4 +1,4 @@
-OBJ=parse.o stats.o settings.o help.o
+OBJ=parse.o stats.o settings.o help.o @LIBUSEFUL_BUNDLED@
 FLAGS=@CFLAGS@ @DEFS@
 LIBS=@LIBS@
 STATIC_LIBS=@LIBUSEFUL_BUNDLED@
@@ -19,10 +19,12 @@ settings.o: settings.h settings.c
 help.o: help.h help.c
 	gcc $(FLAGS) -c help.c
 
+libUseful-5/libUseful.a:
+	make -C libUseful-5
 
 
 clean:
-	rm -rf timediff *.o *.orig
+	rm -rf timediff *.o */*.o */*.so */*.a *.orig
 
 
 install:

config.log

@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by timediff configure 1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure 
+  $ ./configure --with-libuseful=no
 
 ## --------- ##
 ## Platform. ##
@@ -266,58 +266,6 @@ configure:3587: checking for cap_init in -lcap
 configure:3612: gcc -o conftest -g -O2   conftest.c -lcap  -lssl -lcrypto -lz  >&5
 configure:3612: $? = 0
 configure:3621: result: yes
-configure:3636: checking for GetToken in -lUseful-5
-configure:3661: gcc -o conftest -g -O2   conftest.c -lUseful-5  -lcap -lssl -lcrypto -lz  >&5
-configure:3661: $? = 0
-configure:3670: result: yes
-configure:3685: checking for sys/types.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for sys/stat.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for stdlib.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for string.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for memory.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for strings.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for inttypes.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for stdint.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3685: checking for unistd.h
-configure:3685: gcc -c -g -O2  conftest.c >&5
-configure:3685: $? = 0
-configure:3685: result: yes
-configure:3699: checking libUseful-5/libUseful.h usability
-configure:3699: gcc -c -g -O2  conftest.c >&5
-configure:3699: $? = 0
-configure:3699: result: yes
-configure:3699: checking libUseful-5/libUseful.h presence
-configure:3699: gcc -E  conftest.c
-configure:3699: $? = 0
-configure:3699: result: yes
-configure:3699: checking for libUseful-5/libUseful.h
-configure:3699: result: yes
-configure:3773: checking for GetToken in -lUseful-5
-configure:3807: result: yes
 configure:4059: creating ./config.status
 
 ## ---------------------- ##
@@ -335,7 +283,9 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 
 on columPC
 
-config.status:727: creating Makefile
+config.status:725: creating Makefile
+configure:5130: === configuring in libUseful-5 (/tmp/timediff/libUseful-5)
+configure:5193: running /bin/sh ./configure --disable-option-checking '--prefix=/usr/local'  '--with-libuseful=no' --cache-file=/dev/null --srcdir=.
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -360,18 +310,7 @@ ac_cv_env_host_alias_set=
 ac_cv_env_host_alias_value=
 ac_cv_env_target_alias_set=
 ac_cv_env_target_alias_value=
-ac_cv_header_inttypes_h=yes
-ac_cv_header_libUseful_5_libUseful_h=yes
-ac_cv_header_memory_h=yes
 ac_cv_header_stdc=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_lib_Useful_5_GetToken=yes
 ac_cv_lib_cap_cap_init=yes
 ac_cv_lib_crypto_EVP_CIPHER_CTX_init=yes
 ac_cv_lib_ssl_SSL_library_init=yes
@@ -395,7 +334,7 @@ CC='gcc'
 CFLAGS='-g -O2'
 CPP='gcc -E'
 CPPFLAGS=''
-DEFS='-DPACKAGE_NAME=\"timediff\" -DPACKAGE_TARNAME=\"timediff\" -DPACKAGE_VERSION=\"1.0\" -DPACKAGE_STRING=\"timediff\ 1.0\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIBUSEFUL_5_LIBUSEFUL_H=1 -DHAVE_LIBUSEFUL_5=1'
+DEFS='-DPACKAGE_NAME=\"timediff\" -DPACKAGE_TARNAME=\"timediff\" -DPACKAGE_VERSION=\"1.0\" -DPACKAGE_STRING=\"timediff\ 1.0\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1'
 ECHO_C=''
 ECHO_N='-n'
 ECHO_T=''
@@ -404,8 +343,8 @@ EXEEXT=''
 GREP='/bin/grep'
 LDFLAGS=''
 LIBOBJS=''
-LIBS='-lUseful-5 -lcap -lssl -lcrypto -lz '
-LIBUSEFUL_BUNDLED=''
+LIBS='-lcap -lssl -lcrypto -lz '
+LIBUSEFUL_BUNDLED='libUseful-5/libUseful.a'
 LTLIBOBJS=''
 OBJEXT='o'
 PACKAGE_BUGREPORT='[email protected]'
@@ -441,7 +380,7 @@ program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
-subdirs=''
+subdirs=' libUseful-5'
 sysconfdir='${prefix}/etc'
 target_alias=''
 
@@ -462,16 +401,5 @@ target_alias=''
 #define HAVE_LIBCRYPTO 1
 #define HAVE_LIBSSL 1
 #define HAVE_LIBCAP 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LIBUSEFUL_5_LIBUSEFUL_H 1
-#define HAVE_LIBUSEFUL_5 1
 
 configure: exit 0

config.status

@@ -417,7 +417,7 @@ $config_files
 
 Report bugs to <[email protected]>."
 
-ac_cs_config=""
+ac_cs_config="'--with-libuseful=no'"
 ac_cs_version="\
 timediff config.status 1.0
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -427,7 +427,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/colum/work/timediff'
+ac_pwd='/tmp/timediff'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -495,7 +495,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--with-libuseful=no' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -583,8 +583,8 @@ echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
 S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
-S["subdirs"]=""
-S["LIBUSEFUL_BUNDLED"]=""
+S["subdirs"]=" libUseful-5"
+S["LIBUSEFUL_BUNDLED"]="libUseful-5/libUseful.a"
 S["EGREP"]="/bin/grep -E"
 S["GREP"]="/bin/grep"
 S["CPP"]="gcc -E"
@@ -599,14 +599,12 @@ S["CC"]="gcc"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-lUseful-5 -lcap -lssl -lcrypto -lz "
+S["LIBS"]="-lcap -lssl -lcrypto -lz "
 S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"timediff\\\" -DPACKAGE_TARNAME=\\\"timediff\\\" -DPACKAGE_VERSION=\\\"1.0\\\" -DPACKAGE_STRING=\\\"timediff\\ 1.0\\\" -DPACKAGE_BUGREPORT=\\\"colums"\
-"[email protected]\\\" -DPACKAGE_URL=\\\"\\\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1 -D"\
-"HAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H="\
-"1 -DHAVE_UNISTD_H=1 -DHAVE_LIBUSEFUL_5_LIBUSEFUL_H=1 -DHAVE_LIBUSEFUL_5=1"
+"[email protected]\\\" -DPACKAGE_URL=\\\"\\\" -DSTDC_HEADERS=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
 S["libdir"]="${exec_prefix}/lib"