* explicitly call AC_DEFINE_UNQUOTED for PACKAGE and VERSION.

* use only one AC_OUTPUT. seems autoconf doesn't like it when there are
  more of them

diff --git a/configure.in b/configure.in
index 2ae4601..85ad02f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(pdf2swf/swfoutput.h)
-dnl AC_INIT_AUTOMAKE(swftools, 0.0.2)
+AC_INIT(src/)
 AC_ARG_PROGRAM
 
-export CFLAGS
-CFLAGS="-O2 -fomit-frame-pointer"
-export CXXFLAGS
-CXXFLAGS="-O2 -fomit-frame-pointer"
+export PACKAGE=swftools
+export VERSION=0.0.2
+
+export CFLAGS="-O2 -fomit-frame-pointer"
+export CXXFLAGS="-O2 -fomit-frame-pointer"
+
 dnl Checks for programs.
  AC_PROG_AWK
  AC_PROG_CC
@@ -46,23 +47,28 @@ dnl do we need those?
  AC_CHECK_LIB(X11, XFlush)
 
 dnl Checks for header files.
-dnl AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_HEADER(config.h)
  AC_PATH_X
 dnl AC_PATH_XTRA
  AC_HEADER_DIRENT
  AC_HEADER_STDC
  AC_CHECK_HEADERS(math.h fcntl.h limits.h malloc.h unistd.h memory.h zlib.h jpeglib.h t1lib.h)
 
-if test "$ac_cv_header_jpeglib_h" != yes; then
+if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
  DISABLEJPEG2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
 fi
-if test "$ac_cv_header_t1lib_h" != yes; then
+if test "x${ac_cv_header_t1lib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} t1lib.h"
 fi
 
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
 AC_SUBST(HAVE_UNISTD_H)
 AC_SUBST(EXEEXT)
 
@@ -72,11 +78,11 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_OFF_T
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
-dnl AC_CHECK_TYPE(uchar,unsigned char)
-dnl AC_CHECK_TYPE(schar,signed char)
-dnl AC_CHECK_TYPE(word,unsigned short int)
-dnl AC_CHECK_TYPE(sword,unsigned short int)
-dnl AC_CHECK_TYPE(uint,unsigned long int)
+ dnl AC_CHECK_TYPE(uchar,unsigned char)
+ dnl AC_CHECK_TYPE(schar,signed char)
+ dnl AC_CHECK_TYPE(word,unsigned short int)
+ dnl AC_CHECK_TYPE(sword,unsigned short int)
+ dnl AC_CHECK_TYPE(uint,unsigned long int)
 
 dnl Checks for library functions.
  AC_FUNC_MEMCMP
@@ -84,11 +90,9 @@ dnl Checks for library functions.
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS(getcwd putenv socket strcspn strdup strerror strstr)
 
-
-
 if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "***************************************************"
-  echo "The following header/libraries are missing: " ${MISSINGLIBS}
+  echo "The following headers/libraries are missing: " ${MISSINGLIBS}
   echo "Disabling pdf2swf tool..."
   rm pdf2swf/Makefile
   echo all: > pdf2swf/Makefile
@@ -97,8 +101,9 @@ if test "x${DISABLEPDF2SWF}" = "xtrue"; then
     dnl FIXME: Do something here
   fi
   echo "***************************************************"
-  AC_OUTPUT(./release Makefile lib/Makefile src/Makefile)
+  FILES="./release Makefile lib/Makefile src/Makefile"
 else
-  AC_OUTPUT(./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/fonts/Makefile)
+  FILES="./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/fonts/Makefile"
 fi
 
+AC_OUTPUT(${FILES})