Attempting to extend compatibility to FreeBSD

Author: L1L1@gmx.com

INSTALL

@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package.  The following
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented

Makefile.am

@@ -8,7 +8,7 @@ cardpeek_SOURCES = asn1.c asn1.h bytestring.c bytestring.h gui_flexi_cell_render
 
 doc_DATA=doc/cardpeek_ref.en.pdf 
 
-cardpeek_LDADD=cardpeek_resources.$(OBJEXT) @LUA_LIBS@ @PCSC_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @CURL_LIBS@ @LIBICONV@
+cardpeek_LDADD=cardpeek_resources.$(OBJEXT) @LUA_LIBS@ @PCSC_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @CURL_LIBS@ @ICONV_LIBS@
 
 cardpeek_LDFLAGS=-g
 #cardpeek_LDFLAGS=-O2

config.h.in

@@ -3,6 +3,10 @@
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
+/* Define to 1 if you have the declaration of `backtrace', and to 0 if you
+   don't. */
+#undef HAVE_DECL_BACKTRACE
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
@@ -28,6 +32,9 @@
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #undef HAVE_LIBCRYPTO
 
+/* Define to 1 if you have the `execinfo' library (-lexecinfo). */
+#undef HAVE_LIBEXECINFO
+
 /* Define to 1 if you have the `ssl' library (-lssl). */
 #undef HAVE_LIBSSL
 

configure.ac

@@ -47,7 +47,10 @@ PKG_CHECK_MODULES([LUA],[lua-5.2],,[
         fi 
       done
       if test $HAVE_LIBLUA != yes; then
-            AC_MSG_ERROR([Could not find lua 5.2-dev. This program requires the lua 5.2 development library. Please install the lua 5.2 library first.])
+            AC_MSG_ERROR([Could not find lua 5.2-dev.
+ 
+		This program requires the lua 5.2 development library.
+		Please install the lua 5.2 library first.])
       fi
 ])
 ])
@@ -57,7 +60,14 @@ PKG_CHECK_MODULES([CURL],[libcurl],,[
     AC_CHECK_LIB([curl],[curl_easy_init],[
         AC_SUBST([CURL_CFLAGS],[""])
         AC_SUBST([CURL_LIBS],[-lcurl])
-    ])
+	HAVE_LIBCURL=yes
+        ],[HAVE_LIBCURL=no])
+    if test $HAVE_LIBCURL != yes; then
+	AC_MSG_ERROR([Cloud not find libcurl. 
+	
+	This program requires the libcurl development library. 
+	Please install the required library first.]) 
+    fi
 ])
 
 AC_CHECK_LIB([ssl],[SSL_free],,
@@ -69,8 +79,15 @@ AC_CHECK_LIB([crypto],[CRYPTO_free],,
 	     AC_MSG_ERROR([Could not find openssl-dev.
 			  This program requires the openssl dev. library.
 			  Please install it first.]))
-    
+
+AC_CHECK_LIB([execinfo],[backtrace],,)
+AC_CHECK_DECLS([backtrace], [], [], [[#include <execinfo.h>]])
+
+AC_ARG_VAR(ICONV_LIBS,[linker flags for ICONV (e.g. -l iconv), overriding the detected value.])
 AM_ICONV
+if test ! $ICONV_LIBS; then
+	AC_SUBST([ICONV_LIBS],[$LIBICONV])	
+fi
 
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no)
 

lua_iconv.c

@@ -59,7 +59,7 @@ static int subr_iconv_open(lua_State *L)
 static int subr_iconv_iconv(lua_State *L)
 {
     iconv_t ic = luaL_check_iconv(L,1);
-    char *src = (char *)luaL_checkstring(L,2);
+    ICONV_CONST char *src = (ICONV_CONST char *)luaL_checkstring(L,2);
     size_t src_len = strlen(src);
     char conv_block[16];
     size_t conv_len;

main.c

@@ -212,7 +212,7 @@ static gboolean run_command_from_cli(gpointer data)
 }
 
 
-#ifndef _WIN32
+#ifdef HAVE_DECL_BACKTRACE 
 #include <execinfo.h>
 static void do_backtrace()
 {
@@ -231,6 +231,11 @@ static void do_backtrace()
 
     free(btrace);
 }
+#else
+static void do_backtrace()
+{
+   /* void */
+}
 #endif
 
 static const char *message =
@@ -262,9 +267,7 @@ static void save_what_can_be_saved(int sig_num)
     write(2,buf,strlen(buf));
 
     log_printf(LOG_ERROR,"Received signal %i",sig_num); 
-#ifndef _WIN32
     do_backtrace();
-#endif
     log_close_file();
     exit(-2);
 }