|
Check-in Number:
|
3810 | |
| Date: |
2002-Dec-02 19:10:19 (local)
2002-Dec-02 18:10:19 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Added GUID generation logic, and build configuration changes to support it. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/Makefile.in 1.21 -> 1.22
--- Makefile.in 2002/12/02 13:25:36 1.21
+++ Makefile.in 2002/12/02 18:10:19 1.22
@@ -66,9 +66,9 @@
TARGET_PROGS = as_gui
TARGET_MANS = as_gui.1 as_gui.conf.5
-SRCS = as_main.cpp as_gui.cpp as_assist.cpp as_slot.cpp as_dataop.cpp as_except.cpp as_generic.cpp as_amount.cpp as_table.cpp as_pref.cpp as_version.cpp
+SRCS = as_main.cpp as_gui.cpp as_assist.cpp as_slot.cpp as_dataop.cpp as_except.cpp as_generic.cpp as_amount.cpp as_table.cpp as_pref.cpp as_uuidgen.cpp as_version.cpp
-OBJS = as_main.o as_gui.o as_assist.o as_slot.o as_dataop.o as_except.o as_generic.o as_amount.o as_table.o as_pref.o as_version.o
+OBJS = as_main.o as_gui.o as_assist.o as_slot.o as_dataop.o as_except.o as_generic.o as_amount.o as_table.o as_pref.o as_uuidgen.o as_version.o
GRAFX = gfx/ossplogo.xpm
|
|
ossp-pkg/as/as-gui/aclocal.m4 1.3 -> 1.4
--- aclocal.m4 2002/11/28 20:44:36 1.3
+++ aclocal.m4 2002/12/02 18:10:19 1.4
@@ -30,6 +30,46 @@
dnl ##
+dnl ## Look for SIOCGIFHWADDR
+dnl ##
+
+AC_DEFUN(AC_CHECK_SIOCGIFHWADDR,[
+AC_MSG_CHECKING(whether ioctl.h has SIOCGIFHWADDR)
+AC_TRY_RUN(
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+ int main()
+ {
+ int i = SIOCGIFHWADDR;
+ return 0;
+ },
+ AC_DEFINE(HAVE_SIOCGIFHWADDR, 1, [Define to 1 if ioctl.h has SIOCFIFHWADDR]),
+ AC_MSG_RESULT([no]),
+ AC_MSG_RESULT([yes]))
+])dnl
+
+
+dnl ##
+dnl ## Look for SIOCGENADDR
+dnl ##
+
+AC_DEFUN(AC_CHECK_SIOCGENADDR,[
+AC_MSG_CHECKING(whether ioctl.h has SIOCGENADDR)
+AC_TRY_RUN(
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+ int main()
+ {
+ int i = SIOCGENADDR;
+ return 0;
+ },
+ AC_DEFINE(HAVE_SIOCGENADDR, 1, [Define to 1 if ioctl.h has SIOCGENADDR]),
+ AC_MSG_RESULT([no]),
+ AC_MSG_RESULT([yes]))
+])dnl
+
+
+dnl ##
dnl ## Support for Platform IDs
dnl ##
dnl ## configure.in:
|
|
ossp-pkg/as/as-gui/as_slot.cpp 1.29 -> 1.30
--- as_slot.cpp 2002/12/02 13:25:36 1.29
+++ as_slot.cpp 2002/12/02 18:10:19 1.30
@@ -86,6 +86,13 @@
m_pMaintable->insertRows(m_pMaintable->currentRow() + 1); {
m_pMaintable->setCurrentCell(m_pMaintable->currentRow() + 1, m_pMaintable->currentColumn());
}
+
+// char szGuitext[37];
+// uuid_t Guid;
+//
+// uuid_generate(Guid);
+// uuid_unparse(Guid, szGuitext);
+// m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXGUID, szGuitext);
}
//
|
|
ossp-pkg/as/as-gui/configure.in 1.6 -> 1.7
--- configure.in 2002/12/02 13:25:36 1.6
+++ configure.in 2002/12/02 18:10:19 1.7
@@ -50,7 +50,15 @@
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CC_STDC
+
+dnl Checks header requirements
AC_HEADER_STDC
+AC_HEADER_TIME
+AC_CHECK_HEADER([net/if.h],
+ [AC_DEFINE([HAVE_NET_IF_H], 1, [Define to 1 if net/if.h is present])],
+ [AC_MSG_ERROR(You don't have net/if.h)])
+
+dnl AC_CHECK_HEADER(net/if.h, [HAVE_NET_IF_H = yes])
dnl Portable thread conf from acx_pthread.m4 autoconf macro
ACX_PTHREAD
@@ -61,6 +69,8 @@
dnl Check other requirements
AC_PROG_MAKE_SET
AC_CHECK_DEBUGGING
+AC_CHECK_SIOCGIFHWADDR
+AC_CHECK_SIOCGENADDR
dnl Check for Dmalloc library
AC_CHECK_EXTLIB([Dmalloc],
@@ -85,6 +95,11 @@
LIBS="$LIBS -lX11 -lXext -lSM -lm"
fi
+dnl Check type sizes
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+
dnl Check some X resources, typical of XFree86
AC_CHECK_LIB(Xft, XftFreeTypeOpen, [LIBS="$LIBS -lXft"])
AC_CHECK_LIB(Xrender, XRenderFindFormat, [LIBS="$LIBS -lXrender"])
|
|
