diff options
author | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2006-11-30 22:35:28 +0000 |
---|---|---|
committer | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2006-11-30 22:35:28 +0000 |
commit | 78093de42d6edbc4ef0ff9ce2c2b5b33ec3130da (patch) | |
tree | f57c971f8561207d1238f7d001de7b991d4b5ca3 | |
parent | 61e1011c5fe010d4dc7c009a9c1d076f02d2df62 (diff) |
Fix compile problem with log.h
Make pk11install and optionally built feature.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@35 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
-rw-r--r-- | Makefile.am | 7 | ||||
-rw-r--r-- | Makefile.in | 7 | ||||
-rwxr-xr-x | configure | 490 | ||||
-rw-r--r-- | configure.in | 17 | ||||
-rw-r--r-- | src/coolkey/Makefile.in | 2 | ||||
-rw-r--r-- | src/coolkey/log.h | 2 | ||||
-rw-r--r-- | src/install/Makefile | 2 | ||||
-rw-r--r-- | src/install/Makefile.in | 2 | ||||
-rw-r--r-- | src/libckyapplet/Makefile.am | 1 | ||||
-rw-r--r-- | src/libckyapplet/Makefile.in | 3 |
10 files changed, 302 insertions, 231 deletions
diff --git a/Makefile.am b/Makefile.am index 73524e1..a390faf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,11 @@ # Process this file with automake to create Makefile.in. -SUBDIRS = src/libckyapplet src/coolkey src/install +SUBDIRS = src/libckyapplet src/coolkey + +if BUILD_PK11INSTALL +SUBDIRS += src/install +endif ACLOCAL_AMFLAGS = -I m4 @@ -29,3 +33,4 @@ DISTCLEANFILES = AUTOMAKE_OPTIONS = foreign + diff --git a/Makefile.in b/Makefile.in index 9ed20dc..48cec20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,6 +57,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@BUILD_PK11INSTALL_TRUE@am__append_1 = src/install DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure ChangeLog compile config.guess \ @@ -82,7 +83,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = src/libckyapplet src/coolkey src/install DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -103,6 +104,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -209,7 +212,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = src/libckyapplet src/coolkey src/install +SUBDIRS = src/libckyapplet src/coolkey $(am__append_1) ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = DISTCLEANFILES = @@ -463,7 +463,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG NSS_CFLAGS NSS_LIBS LIBCKYAPPLET PCSC_CFLAGS PCSC_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME HAVE_PCSC_TRUE HAVE_PCSC_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKG_CONFIG ac_pt_PKG_CONFIG NSS_CFLAGS NSS_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET PCSC_CFLAGS PCSC_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME HAVE_PCSC_TRUE HAVE_PCSC_FALSE BUILD_PK11INSTALL_TRUE BUILD_PK11INSTALL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -904,6 +904,18 @@ ac_env_target_alias_set=${target_alias+set} ac_env_target_alias_value=$target_alias ac_cv_env_target_alias_set=${target_alias+set} ac_cv_env_target_alias_value=$target_alias +ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_env_PKG_CONFIG_value=$PKG_CONFIG +ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG +ac_env_NSS_CFLAGS_set=${NSS_CFLAGS+set} +ac_env_NSS_CFLAGS_value=$NSS_CFLAGS +ac_cv_env_NSS_CFLAGS_set=${NSS_CFLAGS+set} +ac_cv_env_NSS_CFLAGS_value=$NSS_CFLAGS +ac_env_NSS_LIBS_set=${NSS_LIBS+set} +ac_env_NSS_LIBS_value=$NSS_LIBS +ac_cv_env_NSS_LIBS_set=${NSS_LIBS+set} +ac_cv_env_NSS_LIBS_value=$NSS_LIBS ac_env_CC_set=${CC+set} ac_env_CC_value=$CC ac_cv_env_CC_set=${CC+set} @@ -944,18 +956,6 @@ ac_env_FFLAGS_set=${FFLAGS+set} ac_env_FFLAGS_value=$FFLAGS ac_cv_env_FFLAGS_set=${FFLAGS+set} ac_cv_env_FFLAGS_value=$FFLAGS -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_env_PKG_CONFIG_value=$PKG_CONFIG -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG -ac_env_NSS_CFLAGS_set=${NSS_CFLAGS+set} -ac_env_NSS_CFLAGS_value=$NSS_CFLAGS -ac_cv_env_NSS_CFLAGS_set=${NSS_CFLAGS+set} -ac_cv_env_NSS_CFLAGS_value=$NSS_CFLAGS -ac_env_NSS_LIBS_set=${NSS_LIBS+set} -ac_env_NSS_LIBS_value=$NSS_LIBS -ac_cv_env_NSS_LIBS_set=${NSS_LIBS+set} -ac_cv_env_NSS_LIBS_value=$NSS_LIBS ac_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set} ac_env_PCSC_CFLAGS_value=$PCSC_CFLAGS ac_cv_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set} @@ -1049,6 +1049,7 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-debug add debugging code (default=yes) + --enable-pk11install build an installer for legacy user apps(default=no) --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] @@ -1070,6 +1071,9 @@ Optional Packages: --with-pcsclite Use pcsc-lite (default=yes) Some influential environment variables: + PKG_CONFIG path to pkg-config utility + NSS_CFLAGS C compiler flags for NSS, overriding pkg-config + NSS_LIBS linker flags for NSS, overriding pkg-config CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a @@ -1082,9 +1086,6 @@ Some influential environment variables: CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - PKG_CONFIG path to pkg-config utility - NSS_CFLAGS C compiler flags for NSS, overriding pkg-config - NSS_LIBS linker flags for NSS, overriding pkg-config PCSC_CFLAGS C compiler flags for PCSC, overriding pkg-config PCSC_LIBS linker flags for PCSC, overriding pkg-config @@ -2148,6 +2149,202 @@ echo "${ECHO_T}UNIX/LINUX" >&6 ;; esac +# Add argument for pk11install +# Check whether --enable-pk11install or --disable-pk11install was given. +if test "${enable_pk11install+set}" = set; then + enableval="$enable_pk11install" + +fi; +if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true" +then +if test $WINDOWS -ne 1; then + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + PKG_CONFIG="" + fi + +fi + +pkg_failed=no +echo "$as_me:$LINENO: checking for NSS" >&5 +echo $ECHO_N "checking for NSS... $ECHO_C" >&6 + +if test -n "$PKG_CONFIG"; then + if test -n "$NSS_CFLAGS"; then + pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5 + ($PKG_CONFIG --exists --print-errors "nss") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$NSS_LIBS"; then + pkg_cv_NSS_LIBS="$NSS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5 + ($PKG_CONFIG --exists --print-errors "nss") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"` + else + NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NSS_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5 +echo "$as_me: error: could not find NSS Crypto libraries" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5 +echo "$as_me: error: could not find NSS Crypto libraries" >&2;} + { (exit 1); exit 1; }; } +else + NSS_CFLAGS=$pkg_cv_NSS_CFLAGS + NSS_LIBS=$pkg_cv_NSS_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + true +fi +fi + enable_pk11install = "yes" +else + enable_pk11install = "no" + { echo "$as_me:$LINENO: WARNING: skipping pk11install" >&5 +echo "$as_me: WARNING: skipping pk11install" >&2;} +fi + + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4283,7 +4480,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4286 "configure"' > conftest.$ac_ext + echo '#line 4483 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5418,7 +5615,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5421:" \ +echo "$as_me:5618:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6481,11 +6678,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6484: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6681: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6488: \$? = $ac_status" >&5 + echo "$as_me:6685: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6749,11 +6946,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6949: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6756: \$? = $ac_status" >&5 + echo "$as_me:6953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6853,11 +7050,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6856: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7053: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6860: \$? = $ac_status" >&5 + echo "$as_me:7057: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8322,7 +8519,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8325 "configure"' > conftest.$ac_ext + echo '#line 8522 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9219,7 +9416,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9222 "configure" +#line 9419 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9319,7 +9516,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9322 "configure" +#line 9519 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11663,11 +11860,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11666: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11863: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11670: \$? = $ac_status" >&5 + echo "$as_me:11867: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11767,11 +11964,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11770: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11967: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11774: \$? = $ac_status" >&5 + echo "$as_me:11971: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12303,7 +12500,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12306 "configure"' > conftest.$ac_ext + echo '#line 12503 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13358,11 +13555,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13361: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13558: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13365: \$? = $ac_status" >&5 + echo "$as_me:13562: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13462,11 +13659,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13465: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13662: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13469: \$? = $ac_status" >&5 + echo "$as_me:13666: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14911,7 +15108,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14914 "configure"' > conftest.$ac_ext + echo '#line 15111 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15686,11 +15883,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15689: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15886: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15693: \$? = $ac_status" >&5 + echo "$as_me:15890: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15954,11 +16151,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15957: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16154: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15961: \$? = $ac_status" >&5 + echo "$as_me:16158: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16058,11 +16255,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16258: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16065: \$? = $ac_status" >&5 + echo "$as_me:16262: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17527,7 +17724,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17530 "configure"' > conftest.$ac_ext + echo '#line 17727 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18995,184 +19192,6 @@ echo "$as_me: error: could not locate dynamic library services library" >&2;} { (exit 1); exit 1; }; } fi - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - -if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - PKG_CONFIG=$ac_pt_PKG_CONFIG -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - PKG_CONFIG="" - fi - -fi - -pkg_failed=no -echo "$as_me:$LINENO: checking for NSS" >&5 -echo $ECHO_N "checking for NSS... $ECHO_C" >&6 - -if test -n "$PKG_CONFIG"; then - if test -n "$NSS_CFLAGS"; then - pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5 - ($PKG_CONFIG --exists --print-errors "nss") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$NSS_LIBS"; then - pkg_cv_NSS_LIBS="$NSS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5 - ($PKG_CONFIG --exists --print-errors "nss") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"` - else - NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"` - fi - # Put the nasty error message in config.log where it belongs - echo "$NSS_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5 -echo "$as_me: error: could not find NSS Crypto libraries" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5 -echo "$as_me: error: could not find NSS Crypto libraries" >&2;} - { (exit 1); exit 1; }; } -else - NSS_CFLAGS=$pkg_cv_NSS_CFLAGS - NSS_LIBS=$pkg_cv_NSS_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - true -fi fi # add our compiled static libraries @@ -19295,6 +19314,16 @@ fi +if test x$enable_pk11install = xyes; then + BUILD_PK11INSTALL_TRUE= + BUILD_PK11INSTALL_FALSE='#' +else + BUILD_PK11INSTALL_TRUE='#' + BUILD_PK11INSTALL_FALSE= +fi + + + cat >>confdefs.h <<\_ACEOF #define DEBUG 1 _ACEOF @@ -20989,6 +21018,13 @@ echo "$as_me: error: conditional \"HAVE_PCSC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BUILD_PK11INSTALL_TRUE}" && test -z "${BUILD_PK11INSTALL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_PK11INSTALL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_PK11INSTALL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -21562,6 +21598,10 @@ s,@am__untar@,$am__untar,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t +s,@NSS_CFLAGS@,$NSS_CFLAGS,;t t +s,@NSS_LIBS@,$NSS_LIBS,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -21597,10 +21637,6 @@ s,@F77@,$F77,;t t s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t -s,@NSS_CFLAGS@,$NSS_CFLAGS,;t t -s,@NSS_LIBS@,$NSS_LIBS,;t t s,@LIBCKYAPPLET@,$LIBCKYAPPLET,;t t s,@PCSC_CFLAGS@,$PCSC_CFLAGS,;t t s,@PCSC_LIBS@,$PCSC_LIBS,;t t @@ -21609,6 +21645,8 @@ s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t s,@SCARD_LIB_NAME@,$SCARD_LIB_NAME,;t t s,@HAVE_PCSC_TRUE@,$HAVE_PCSC_TRUE,;t t s,@HAVE_PCSC_FALSE@,$HAVE_PCSC_FALSE,;t t +s,@BUILD_PK11INSTALL_TRUE@,$BUILD_PK11INSTALL_TRUE,;t t +s,@BUILD_PK11INSTALL_FALSE@,$BUILD_PK11INSTALL_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.in b/configure.in index 79b1c1b..364a075 100644 --- a/configure.in +++ b/configure.in @@ -82,6 +82,21 @@ case "$host" in ;; esac +# Add argument for pk11install +AC_ARG_ENABLE(pk11install, + [ --enable-pk11install build an installer for legacy user apps(default=no)]) +if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true" +then +if test $WINDOWS -ne 1; then + PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ]) +fi + enable_pk11install = "yes" +else + enable_pk11install = "no" + AC_MSG_WARN([skipping pk11install]) +fi + + # Checks for programs. AC_PROG_CC AC_PROG_CXX @@ -93,7 +108,6 @@ AC_PROG_LN_S if test $WINDOWS -ne 1; then AC_CHECK_LIB(z, uncompress, , AC_MSG_ERROR(could not locate libz compression library)) AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR(could not locate dynamic library services library)) -PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ]) fi # add our compiled static libraries @@ -122,6 +136,7 @@ AC_SUBST(PCSC_CFLAGS) AC_SUBST(PCSC_LIBS) AC_SUBST(SCARD_LIB_NAME) AM_CONDITIONAL(HAVE_PCSC, test x$with_pcsclite = xyes) +AM_CONDITIONAL(BUILD_PK11INSTALL, test x$enable_pk11install = xyes) AC_DEFINE(DEBUG, 1, [Define to 1 if you want to include debugging code.]) # Checks for header files. diff --git a/src/coolkey/Makefile.in b/src/coolkey/Makefile.in index ae97e45..bb16cda 100644 --- a/src/coolkey/Makefile.in +++ b/src/coolkey/Makefile.in @@ -124,6 +124,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/src/coolkey/log.h b/src/coolkey/log.h index a586ced..015c7bf 100644 --- a/src/coolkey/log.h +++ b/src/coolkey/log.h @@ -56,7 +56,7 @@ class FileLog : public Log { class SysLog : public Log { private: SysLog(SysLog &) {} - SysLog * operator=(SysLog &) { return *this; } + SysLog & operator=(SysLog &) { return *this; } public: SysLog() { } void log(const char *msg, ...); diff --git a/src/install/Makefile b/src/install/Makefile index 798eb3b..83a1dac 100644 --- a/src/install/Makefile +++ b/src/install/Makefile @@ -100,6 +100,8 @@ AUTOCONF = ${SHELL} /builds/fedora/coolkey/missing --run autoconf AUTOHEADER = ${SHELL} /builds/fedora/coolkey/missing --run autoheader AUTOMAKE = ${SHELL} /builds/fedora/coolkey/missing --run automake-1.9 AWK = gawk +BUILD_PK11INSTALL_FALSE = # +BUILD_PK11INSTALL_TRUE = CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 diff --git a/src/install/Makefile.in b/src/install/Makefile.in index f26991d..f644620 100644 --- a/src/install/Makefile.in +++ b/src/install/Makefile.in @@ -100,6 +100,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/src/libckyapplet/Makefile.am b/src/libckyapplet/Makefile.am index 496dc6f..c23d1c1 100644 --- a/src/libckyapplet/Makefile.am +++ b/src/libckyapplet/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = AM_CFLAGS = # bleh what do I add just to get static but pic libraries? +bogusdir = $(libdir)/bogus lib_LTLIBRARIES = libckyapplet.la libckyapplet_la_SOURCES = \ diff --git a/src/libckyapplet/Makefile.in b/src/libckyapplet/Makefile.in index 2e64426..bc1cccf 100644 --- a/src/libckyapplet/Makefile.in +++ b/src/libckyapplet/Makefile.in @@ -123,6 +123,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_PK11INSTALL_FALSE = @BUILD_PK11INSTALL_FALSE@ +BUILD_PK11INSTALL_TRUE = @BUILD_PK11INSTALL_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -233,6 +235,7 @@ SUBDIRS = AM_CFLAGS = # bleh what do I add just to get static but pic libraries? +bogusdir = $(libdir)/bogus lib_LTLIBRARIES = libckyapplet.la libckyapplet_la_SOURCES = \ cky_applet.c \ |