Changeset 1509

Timestamp:

01/14/08 01:49:16 (9 months ago)

Author:

common

Message:

libemu

• auto* libcargos with --enable-cargos --with-cargos-lib= --with-cargos-inc=
  sctest uses per-program specific CPPFLAGS and LDFLAGS to link libcargos if avalible
  

Files:

• libemu/trunk/configure.ac (modified) (3 diffs)
• libemu/trunk/testsuite/Makefile.am (modified) (1 diff)

libemu/trunk/configure.ac

@@ -83 +83 @@
-AC_SUBST(libemu_soname)
-
-
+
-
-dnl **************************************************
@@ -151 +151 @@
-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS], [test x$enable_python = xtrue])
-
+dnl **************************************************
+dnl * libcargos                                      *
+dnl **************************************************
+
+
+AC_SUBST([LIB_CARGOS])
+AC_SUBST([LIB_CARGOS_LIBDIR])
+AC_SUBST([LIB_CARGOS_INCDIR])
+
+
+enable_cargos="yes"
+
+AC_ARG_ENABLE(cargos, [  --enable-cargos      enable support for libcargos],
+                        [enable_cargos="$enableval"],[enable_cargos="yes"])
+
+AC_ARG_WITH(cargos-include,
+                        [  --with-cargos-include=DIR  libcargos include dir],
+                                      [cargos_inc="$withval"],[cargos_inc=no])
+AC_ARG_WITH(cargos-lib,
+                        [  --with-cargos-lib=DIR  libcargos library dir],
+                        [cargos_lib="$withval"],[cargos_lib=no])
+
+
+if test x$enable_cargos = "xyes" ; then
+        OLD_CPPFLAGS=${CPPFLAGS};
+        if test x$cargos_inc != "xno"; then
+                CPPFLAGS="${CPPFLAGS} -I${cargos_inc}"
+        fi
+        
+        AC_CHECK_HEADER(cargos-lib.h,[enable_cargos=yes],[enable_cargos=no])
+        
+        if test x$enable_cargos = "xyes" ; then
+                OLD_LDFLAGS=${LDFLAGS}
+                if test x$cargos_lib != "xno"; then
+                        LDFLAGS="${LDFLAGS}  -L${cargos_lib}"
+                fi
+        
+                AC_CHECK_LIB([cargos],[cargos_lib_create],enable_cargos="yes", enable_cargos="no")
+        
+                if test x$enable_cargos = "xyes" ; then
+                        LIB_CARGOS="-lcargos"
+                        LIB_CARGOS_LIBDIR="-L$cargos_lib"
+                        LIB_CARGOS_INCDIR="-I$cargos_inc"
+                        AC_DEFINE([HAVE_LIBCARGOS], [1], [Define to 1 to compile with cargos support])
+                fi
+        fi
+        CPPFLAGS=${OLD_CPPFLAGS}
+        LDFLAGS=${OLD_LDFLAGS}
+fi
-
-
@@ -204 +253 @@
-echo "bindings"
-echo " - python                          : $enable_python"
+echo ""
+echo "support"
+echo " - cargos                          : $enable_cargos"
+

libemu/trunk/testsuite/Makefile.am

@@ -17 +17 @@
-instrtest_SOURCES = instrtest.c
-
+sctest_CPPFLAGS = ${LIB_CARGOS_INCDIR}  ${AM_CPPFLAGS}
+sctest_LDFLAGS =  ${LIB_CARGOS} ${LIB_CARGOS_LIBDIR} ${AM_LDFLAGS}
-sctest_LDADD = ../src/libemu.la
-sctest_SOURCES = sctest.c