initialize

Signed-off-by: Michael Rasmussen <mir@datanom.net>

diff --git a/configure.ac b/configure.ac
index 92465fc42eefa09bb99f70ee3475d9cc39d6d2c3..5c913935c19bdc4158e2fea422c1839fa6c9237d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(llist, 0.1, mir@datanom.net)
-AC_CONFIG_SRCDIR(src/main.c)
+AC_INIT(libvcard, 0.1, mir@datanom.net)
+AC_CONFIG_SRCDIR(src/vcard.c)
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADER([config.h])
@@ -46,18 +46,16 @@ AC_TYPE_SSIZE_T
 # Optional building instructions
 if test $USE_MAINTAINER_MODE = yes; then
                 CFLAGS="$CFLAGS -g -Werror"
-               LIBS="$LIBS"
-                DEBUG="YES"
+               LIBS="$GLIB_LIBS"
 else
                 CFLAGS="$CFLAGS -O -O2"
-               LIBS="$LIBS"
-                DEBUG="NO"
+               LIBS="$GLIB_LIBS"
 fi
 
-AC_ARG_ENABLE(example,
+ac_enable_example="no"
+AC_ARG_ENABLE([example],
         [AC_HELP_STRING([--enable-example],[Build example [default=no]])],
-        [ac_enable_example=$enableval],
-        [ac_enable_example=no])
+        [ac_enable_example="${enableval}"])
 
 AC_MSG_CHECKING([whether to compile the example application])
 if test x"$ac_enable_example" = xyes; then
@@ -73,6 +71,7 @@ AC_CONFIG_COMMANDS(
     echo -e "libvcard will be compiled with these settings:"
     echo -e "\tCFLAGS:\t\t${CFLAGS}"
     echo -e "\tLIBS:\t\t${LIBS}"
+    echo -e "\tExample:\t${EXAMPLE}"
     echo ""
     echo -e "Now run make to build library"
     echo ""
@@ -82,6 +81,7 @@ AC_CONFIG_COMMANDS(
     [
      CFLAGS="$CFLAGS"
      LIBS="$LIBS"
+     EXAMPLE="$ac_enable_example"
     ]
 )
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e9af869fb85e20943a54ac81100ee3a53cce85a..756e8fc888e2e985159e7984dc6de2e3fed0dba0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,8 +16,8 @@ libvcard_la_LIBADD = \
            @GLIB_LIBS@
 
 if BUILD_EXAMPLE
-bin_PROGRAMS = vcard-test
-vcard_SOURCES = vcard-test.c
-vcard_LDADD = libvcard.la
+bin_PROGRAMS = vcard-example
+vcard_example_SOURCES = vcard-example.c
+vcard_example_LDADD = libvcard.la
 endif
 

diff --git a/src/vcard-example.c b/src/vcard-example.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/vcard-test.c b/src/vcard-test.c
deleted file mode 100644 (file)
index e69de29..0000000