autotools fixes

admin/cvs.sh

@@ -8,7 +8,7 @@
 
 unset MAKEFLAGS
 
-ACLOCALFLAGS = -I m4/
+ACLOCALFLAGS="-I m4/"
 
 call_and_fix_autoconf()
 {

config.h.in

+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+
+/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
+#undef HAVE_CARBON_CARBON_H
+
+/* Define if you have the CoreAudio API */
+#undef HAVE_COREAUDIO
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+#undef HAVE_CRT_EXTERNS_H
+
+/* Defines if your system has the crypt function */
+#undef HAVE_CRYPT
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#undef HAVE_CTYPE_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if dns-sd is available */
+#undef HAVE_DNSSD
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you have libjpeg */
+#undef HAVE_LIBJPEG
+
+/* Define to 1 if you have the `osipparser2' library (-losipparser2). */
+#undef HAVE_LIBOSIPPARSER2
+
+/* Define if you have libpng */
+#undef HAVE_LIBPNG
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define if you have libz */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if your system needs _NSGetEnviron to set up the environment */
+#undef HAVE_NSGETENVIRON
+
+/* Define to 1 if you have the <ostream> header file. */
+#undef HAVE_OSTREAM
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Define if you have res_init */
+#undef HAVE_RES_INIT
+
+/* Define if you have the res_init prototype */
+#undef HAVE_RES_INIT_PROTO
+
+/* Define to 1 if you have the <semaphore.h> header file. */
+#undef HAVE_SEMAPHORE_H
+
+/* Define to 1 if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
+
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define if you have strlcat */
+#undef HAVE_STRLCAT
+
+/* Define if you have the strlcat prototype */
+#undef HAVE_STRLCAT_PROTO
+
+/* Define if you have strlcpy */
+#undef HAVE_STRLCPY
+
+/* Define if you have the strlcpy prototype */
+#undef HAVE_STRLCPY_PROTO
+
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+#undef HAVE_SYS_BITYPES_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/sem.h> header file. */
+#undef HAVE_SYS_SEM_H
+
+/* Define to 1 if you have the <sys/signal.h> header file. */
+#undef HAVE_SYS_SIGNAL_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <varargs.h> header file. */
+#undef HAVE_VARARGS_H
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
+/* Suffix for lib directories */
+#undef KDELIBSUFF
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* The size of a `char *', as computed by sizeof. */
+#undef SIZEOF_CHAR_P
+
+/* The size of a `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of a `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of a `short', as computed by sizeof. */
+#undef SIZEOF_SHORT
+
+/* The size of a `size_t', as computed by sizeof. */
+#undef SIZEOF_SIZE_T
+
+/* The size of a `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/*
+ * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
+ * headers and I'm too lazy to write a configure test as long as only
+ * unixware is related
+ */
+#ifdef _UNIXWARE
+#define HAVE_BOOLEAN
+#endif
+
+
+
+/*
+ * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
+ * that defines bzero.
+ */
+
+#if defined(_AIX)
+#include <strings.h>
+#endif
+
+
+
+#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
+# include <sys/time.h>
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+#endif
+
+
+
+#if !defined(HAVE_RES_INIT_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+int res_init(void);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
+
+#if !defined(HAVE_STRLCAT_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned long strlcat(char*, const char*, unsigned long);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
+
+#if !defined(HAVE_STRLCPY_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned long strlcpy(char*, const char*, unsigned long);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
+
+/*
+ * On HP-UX, the declaration of vsnprintf() is needed every time !
+ */
+
+#if !defined(HAVE_VSNPRINTF) || defined(hpux)
+#if __STDC__
+#include <stdarg.h>
+#include <stdlib.h>
+#else
+#include <varargs.h>
+#endif
+#ifdef __cplusplus
+extern "C"
+#endif
+int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
+#ifdef __cplusplus
+extern "C"
+#endif
+int snprintf(char *str, size_t n, char const *fmt, ...);
+#endif
+
+
+
+#if defined(__SVR4) && !defined(__svr4__)
+#define __svr4__ 1
+#endif
+
+
+/* type to use in place of socklen_t if not defined */
+#undef kde_socklen_t
+
+/* type to use in place of socklen_t if not defined (deprecated, use
+   kde_socklen_t) */
+#undef ksize_t

skins/gmetal/Makefile.am

+datadir = $(sflphone_datadir)/skins/gmetal
+data_DATA = *.png
\ No newline at end of file

skins/metal/Makefile.am

+datadir = $(sflphone_datadir)/skins/metal
+data_DATA = *.png
\ No newline at end of file

src/gui/qt/Makefile.am

+libexec_PROGRAMS = sflphone-qt
+
+BUILT_SOURCES = \
+    ./moc_ConfigurationPanel.cpp \
+    ./ConfigurationPanelui.cpp \
+    ./ConfigurationPanel.h \
+    ./ConfigurationManagerImplmoc.cpp \
+    ./ConfigurationPanelImplmoc.cpp \
+    ./JPushButtonmoc.cpp \
+    ./Launchermoc.cpp \
+    ./NumericKeypadmoc.cpp \
+    ./PhoneLinemoc.cpp \
+    ./PhoneLineButtonmoc.cpp \
+    ./PhoneLineManagerImplmoc.cpp \
+    ./SFLLcdmoc.cpp \
+    ./SFLPhoneAppmoc.cpp \
+    ./SFLPhoneWindowmoc.cpp \
+    ./SFLRequestmoc.cpp \
+    ./Requestmoc.cpp \
+    ./SessionIOmoc.cpp \
+    ./TCPSessionIOmoc.cpp \
+    ./TransparentWidgetmoc.cpp \
+    ./VolumeControlmoc.cpp 
+
+IMAGES = $(top_srcdir)/images/*.png
+
+sflphone_qt_SOURCES = \
+    $(BUILT_SOURCES) \
+    ./Account.cpp \
+    ./Account.hpp \
+    ./Call.cpp \
+    ./Call.hpp \
+    ./CallManager.hpp \
+    ./CallManagerImpl.cpp \
+    ./CallManagerImpl.hpp \
+    ./CallStatus.cpp \
+    ./CallStatus.hpp \
+    ./CallStatusFactory.hpp \
+    ./ConfigurationManager.hpp \
+    ./ConfigurationManagerImpl.cpp \
+    ./ConfigurationManagerImpl.hpp \
+    ./ConfigurationPanelImpl.cpp \
+    ./ConfigurationPanelImpl.hpp \
+    ./DebugOutput.hpp \
+    ./DebugOutputImpl.cpp \
+    ./DebugOutputImpl.hpp \
+    ./Event.cpp \
+    ./Event.hpp \
+    ./EventFactory.hpp \
+    ./EventFactory.inl \
+    ./Factory.hpp \
+    ./Factory.inl \
+    ./JPushButton.cpp JPushButton.hpp \
+    ./Launcher.cpp \
+    ./Launcher.hpp \
+    ./NumericKeypad.cpp \
+    ./NumericKeypad.hpp \
+    ./ObjectFactory.hpp \
+    ./ObjectFactory.inl \
+    ./ObjectPool.hpp \
+    ./ObjectPool.inl \
+    ./PhoneLine.cpp \
+    ./PhoneLine.hpp \
+    ./PhoneLineButton.cpp \
+    ./PhoneLineButton.hpp \
+    ./PhoneLineLocker.cpp \
+    ./PhoneLineLocker.hpp \
+    ./PhoneLineManager.hpp \
+    ./PhoneLineManagerImpl.cpp \
+    ./PhoneLineManagerImpl.hpp \
+    ./QjListBoxPixmap.cpp \
+    ./QjListBoxPixmap.hpp \
+    ./Request.cpp \
+    ./Request.hpp \
+    ./Requester.hpp \
+    ./RequesterImpl.cpp \
+    ./RequesterImpl.hpp \
+    ./RequesterImpl.inl \
+    ./SFLCallStatus.hpp \
+    ./SFLEvents.cpp \
+    ./SFLEvents.hpp \
+    ./SFLLcd.cpp \
+    ./SFLLcd.hpp \
+    ./SFLPhoneApp.cpp \
+    ./SFLPhoneApp.hpp \
+    ./SFLPhoneWindow.cpp \
+    ./SFLPhoneWindow.hpp \
+    ./SFLRequest.cpp \
+    ./SFLRequest.hpp \
+    ./Session.cpp \
+    ./Session.hpp \
+    ./SessionFactory.hpp \
+    ./SessionIO.hpp \
+    ./SessionIOFactory.hpp \
+    ./SkinManager.hpp \
+    ./SkinManagerImpl.cpp \
+    ./SkinManagerImpl.hpp \
+    ./TCPSessionIO.cpp \
+    ./TCPSessionIO.hpp \
+    ./TCPSessionIOCreator.cpp \
+    ./TCPSessionIOCreator.hpp \
+    ./TransparentWidget.cpp \
+    ./TransparentWidget.hpp \
+    ./Url.cpp \
+    ./Url.hpp \
+    ./VolumeControl.cpp \
+    ./VolumeControl.hpp \
+    ./globals.h \
+    ./main.cpp \
+    ./qmake_image_collection.cpp
+
+CLEANFILES = \
+	$(BUILT_SOURCES)
+
+sflphone_qt_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DDATADIR=\"$(datadir)\"
+sflphone_qt_LIBS = $(LIB_QT) 
+sflphone_qt_LDADD = $(top_srcdir)/libs/taxidermy/libtaxidermy.la
+
+KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(KDE_INCLUDES) $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
+AM_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(all_libraries)
+
+qmake_image_collection.cpp: $(IMAGES)
+	$(UIC) -embed sflphone-qt $(IMAGES) -o $@
+
+%.h: %.ui
+	$(UIC) -o $@ $<
+
+moc_%.cpp: %.h
+	$(MOC) -o $@ $<
+
+%moc.cpp: %.hpp
+	$(MOC) -o $@ $<
+
+%ui.cpp: %.ui
+	$(UIC) -o $@ -impl $*.h $<
+
+