#51

diff --git a/luaejdb/Makefile.in b/luaejdb/Makefile.in
index f224527..c693f32 100644 (file)
--- a/luaejdb/Makefile.in
+++ b/luaejdb/Makefile.in
@@ -1,5 +1,15 @@
 
 
+# Package information
+PACKAGE = @PACKAGE_NAME@
+VERSION = @PACKAGE_VERSION@
+PACKAGEDIR = $(PACKAGE)-$(VERSION)
+PACKAGETGZ = $(PACKAGE)-$(VERSION).tar.gz
+
+# Targets
+LIBRARYFILES = @MYLIBRARYFILES@
+LIBOBJFILES = @MYLIBOBJFILES@
+
 CC = @CC@
 CPPFLAGS = @MYCPPFLAGS@
 CFLAGS = @MYCFLAGS@

diff --git a/luaejdb/configure b/luaejdb/configure
index 029f042..a94594f 100755 (executable)
--- a/luaejdb/configure
+++ b/luaejdb/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ejdb 1.0.1.
+# Generated by GNU Autoconf 2.69 for ejdb-lua 1.0.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -575,10 +575,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='ejdb'
-PACKAGE_TARNAME='ejdb'
+PACKAGE_NAME='ejdb-lua'
+PACKAGE_TARNAME='ejdb-lua'
 PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='ejdb 1.0.1'
+PACKAGE_STRING='ejdb-lua 1.0.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -620,6 +620,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+MYLIBRARYFILES
 MYLDFLAGS
 MYLDLIBPATHENV
 MYCPPFLAGS
@@ -1226,7 +1227,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ejdb 1.0.1 to adapt to many kinds of systems.
+\`configure' configures ejdb-lua 1.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1274,7 +1275,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/ejdb]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/ejdb-lua]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1287,7 +1288,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ejdb 1.0.1:";;
+     short | recursive ) echo "Configuration of ejdb-lua 1.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1367,7 +1368,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ejdb configure 1.0.1
+ejdb-lua configure 1.0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1665,7 +1666,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ejdb $as_me 1.0.1, which was
+It was created by ejdb-lua $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2016,6 +2017,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 luaver=`lua -e 'v = string.gsub(_VERSION, ".* ", ""); print(v)'`
 
+MYLIBRARYFILES=""
 MYLIBOBJFILES="luaejdb.o"
 MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2 $MYCFLAGS"
 MYCPPFLAGS="-DNDEBUG -D_GNU_SOURCE=1 $MYCPPFLAGS"
@@ -2034,17 +2036,21 @@ then
   LD_LIBRARY_PATH="`pkg-config --variable=libdir tcejdb`:`pkg-config --variable=libdir lua$luaver`:$LD_LIBRARY_PATH"
   CPATH="`pkg-config --variable=includedir tcejdb`:`pkg-config --variable=includedir lua$luaver`/lua$luaver:$CPATH"
   export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-  MYCFLAGS="$MYCFLAGS `pkg-config --cflags tcejdb lua$luaver`"
+  MYCPPFLAGS="$MYCPPFLAGS `pkg-config --cflags tcejdb lua$luaver`"
 fi
 
-prinf "$LIBRARY_PATH"
+printf "$LIBRARY_PATH"
 
 # Shared libraries
 if uname | grep Darwin >/dev/null
 then
+  MYLIBRARYFILES="$MYLIBRARYFILES luaejdb.dylib"
   MYLDLIBPATHENV="DYLD_LIBRARY_PATH"
+else
+  MYLIBRARYFILES="$MYLIBRARYFILES luaejdb.so"
 fi
 
+
 # C compiler
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3297,6 +3303,7 @@ fi
 
 
 
+
 # Targets
 ac_config_files="$ac_config_files Makefile"
 
@@ -3842,7 +3849,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ejdb $as_me 1.0.1, which was
+This file was extended by ejdb-lua $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3895,7 +3902,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ejdb config.status 1.0.1
+ejdb-lua config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/luaejdb/configure.ac b/luaejdb/configure.ac
index e7a98dc..e884b00 100644 (file)
--- a/luaejdb/configure.ac
+++ b/luaejdb/configure.ac
@@ -4,10 +4,11 @@ test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
 test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
 
 # Package name
-AC_INIT(ejdb, 1.0.1)
+AC_INIT(ejdb-lua, 1.0.1)
 
 luaver=`lua -e 'v = string.gsub(_VERSION, ".* ", ""); print(v)'`
 
+MYLIBRARYFILES=""
 MYLIBOBJFILES="luaejdb.o"
 MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2 $MYCFLAGS"
 MYCPPFLAGS="-DNDEBUG -D_GNU_SOURCE=1 $MYCPPFLAGS"
@@ -26,17 +27,21 @@ then
   LD_LIBRARY_PATH="`pkg-config --variable=libdir tcejdb`:`pkg-config --variable=libdir lua$luaver`:$LD_LIBRARY_PATH"
   CPATH="`pkg-config --variable=includedir tcejdb`:`pkg-config --variable=includedir lua$luaver`/lua$luaver:$CPATH"
   export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-  MYCFLAGS="$MYCFLAGS `pkg-config --cflags tcejdb lua$luaver`"
+  MYCPPFLAGS="$MYCPPFLAGS `pkg-config --cflags tcejdb lua$luaver`"
 fi
 
-prinf "$LIBRARY_PATH"
+printf "$LIBRARY_PATH"
 
 # Shared libraries
 if uname | grep Darwin >/dev/null
 then
+  MYLIBRARYFILES="$MYLIBRARYFILES luaejdb.dylib"
   MYLDLIBPATHENV="DYLD_LIBRARY_PATH"
+else
+  MYLIBRARYFILES="$MYLIBRARYFILES luaejdb.so"
 fi
 
+
 # C compiler
 AC_PROG_CC
 
@@ -50,6 +55,7 @@ AC_SUBST(MYCFLAGS)
 AC_SUBST(MYCPPFLAGS)
 AC_SUBST(MYLDLIBPATHENV)
 AC_SUBST(MYLDFLAGS)
+AC_SUBST(MYLIBRARYFILES)
 
 # Targets
 AC_OUTPUT(Makefile)