* dmraid ./configure ./configure.in ./make.tmpl. ...
@ 2010-05-30 19:15 zkabelac
0 siblings, 0 replies; 3+ messages in thread
From: zkabelac @ 2010-05-30 19:15 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-30 19:15:26
Modified files:
. : configure configure.in make.tmpl.in
include : config.h.in
lib : Makefile.in
Log message:
Add simplified detection for libdevmapper-event library
Future extension to static linking might be needed
Current check only detects devmapper-event library - as the new libdevmapper linking
links libdevmapper library automaticaly as a dependency.
In case this project would need to link with older version futher extension might
be needed here (adding -ldevmapper check).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/configure.diff?cvsroot=dm&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/configure.in.diff?cvsroot=dm&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/include/config.h.in.diff?cvsroot=dm&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/Makefile.in.diff?cvsroot=dm&r1=1.14&r2=1.15
--- dmraid/configure 2010/05/30 17:44:55 1.10
+++ dmraid/configure 2010/05/30 19:15:26 1.11
@@ -651,6 +651,7 @@
DMRAID_LIB_MAJOR
DMRAID_LIB_DATE
DIETLIBC
+DEVMAPPEREVENT_LIBS
DEBUG_MALLOC
DEBUG
CLDFLAGS
@@ -8149,6 +8150,231 @@
fi
+{ $as_echo "$as_me:$LINENO: checking for dm_task_set_name in -ldevmapper-event" >&5
+$as_echo_n "checking for dm_task_set_name in -ldevmapper-event... " >&6; }
+if test "${ac_cv_lib_devmapper_event_dm_task_set_name+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldevmapper-event $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dm_task_set_name ();
+int
+main ()
+{
+return dm_task_set_name ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_devmapper_event_dm_task_set_name=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_devmapper_event_dm_task_set_name=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_devmapper_event_dm_task_set_name" >&5
+$as_echo "$ac_cv_lib_devmapper_event_dm_task_set_name" >&6; }
+if test "x$ac_cv_lib_devmapper_event_dm_task_set_name" = x""yes; then
+ DEVMAPPEREVENT_LIBS="-ldevmapper-event"
+else
+ { { $as_echo "$as_me:$LINENO: error: device-mapper-event library is either missing or is too old and badly linked." >&5
+$as_echo "$as_me: error: device-mapper-event library is either missing or is too old and badly linked." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+for ac_header in libdevmapper.h libdevmapper-event.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ { { $as_echo "$as_me:$LINENO: error: Missing headers device-mapper headers." >&5
+$as_echo "$as_me: error: Missing headers device-mapper headers." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+done
+
+
VERSION=$srcdir/tools/VERSION
DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION)
DMRAID_LIB_MINOR=$(cut -d. -f2 $VERSION)
@@ -8177,6 +8403,7 @@
+
ac_config_files="$ac_config_files include/Makefile lib/Makefile lib/version.h man/Makefile tools/Makefile tools/version.h Makefile make.tmpl"
cat >confcache <<\_ACEOF
--- dmraid/configure.in 2010/05/30 17:44:55 1.10
+++ dmraid/configure.in 2010/05/30 19:15:26 1.11
@@ -232,6 +232,14 @@
AC_CHECK_HEADERS(getopt.h, AC_DEFINE(HAVE_GETOPTLONG, 1, [Define to 1 for longopt.]))
fi
+dnl FIXME static linking would need some extension here
+dnl best would be to use pkg-config in Makefiles
+AC_CHECK_LIB(devmapper-event, dm_task_set_name,
+ [DEVMAPPEREVENT_LIBS="-ldevmapper-event"],
+ [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked.])])
+AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,,
+ [AC_MSG_ERROR([Missing headers device-mapper headers.])])
+
VERSION=$srcdir/tools/VERSION
DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION)
DMRAID_LIB_MINOR=$(cut -d. -f2 $VERSION)
@@ -244,6 +252,7 @@
AC_SUBST(CLDFLAGS)
AC_SUBST(DEBUG)
AC_SUBST(DEBUG_MALLOC)
+AC_SUBST(DEVMAPPEREVENT_LIBS)
AC_SUBST(DIETLIBC)
AC_SUBST(DMRAID_LIB_DATE)
AC_SUBST(DMRAID_LIB_MAJOR)
--- dmraid/make.tmpl.in 2010/05/30 17:44:55 1.11
+++ dmraid/make.tmpl.in 2010/05/30 19:15:26 1.12
@@ -17,11 +17,12 @@
LIBS = @LIBS@
AWK = @AWK@
SED = @SED@
+DEVMAPPEREVENT_LIBS = @DEVMAPPEREVENT_LIBS@
+DMRAID_LIB_DATE = @DMRAID_LIB_DATE@
DMRAID_LIB_MAJOR = @DMRAID_LIB_MAJOR@
DMRAID_LIB_MINOR = @DMRAID_LIB_MINOR@
DMRAID_LIB_SUBMINOR = @DMRAID_LIB_SUBMINOR@
DMRAID_LIB_SUFFIX = @DMRAID_LIB_SUFFIX@
-DMRAID_LIB_DATE = @DMRAID_LIB_DATE@
CFLAGS += @CFLAGS@
CLDFLAGS += @CLDFLAGS@
--- dmraid/include/config.h.in 2010/05/30 17:44:55 1.2
+++ dmraid/include/config.h.in 2010/05/30 19:15:26 1.3
@@ -43,6 +43,12 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the <libdevmapper-event.h> header file. */
+#undef HAVE_LIBDEVMAPPER_EVENT_H
+
+/* Define to 1 if you have the <libdevmapper.h> header file. */
+#undef HAVE_LIBDEVMAPPER_H
+
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
--- dmraid/lib/Makefile.in 2010/05/30 17:41:22 1.14
+++ dmraid/lib/Makefile.in 2010/05/30 19:15:26 1.15
@@ -75,12 +75,12 @@
DMRAID_LIB_VERSION = $(DMRAID_LIB_MAJOR).$(DMRAID_LIB_MINOR).$(DMRAID_LIB_SUBMINOR)
$(LIB_SHARED): $(OBJECTS) $(LD_DEPS)
- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) -ldevmapper-event \
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(DEVMAPPEREVENT_LIBS) \
-shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) $(CLDFLAGS)
$(LIB_EVENTS_SHARED): $(OBJECTS2)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
- -shared -Wl,-soname,$(notdir $@) -ldevmapper-event -lpthread
+ -shared -Wl,-soname,$(notdir $@) $(DEVMAPPEREVENT_LIBS) -lpthread
.PHONY: $(addprefix install_,$(TARGETS)) $(addprefix remove_,$(TARGETS))
^ permalink raw reply [flat|nested] 3+ messages in thread
* dmraid ./configure ./configure.in ./make.tmpl. ...
@ 2010-05-31 9:24 zkabelac
0 siblings, 0 replies; 3+ messages in thread
From: zkabelac @ 2010-05-31 9:24 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-31 09:24:43
Modified files:
. : configure configure.in make.tmpl.in
lib : Makefile.in
Log message:
Add configure detection for -ldl and -lpthread
Check for devmapper installation
Link all used libs by libdmraid and its plugin
(do not expect devmapper-event will have devmapper and dl)
Add few more linker flags for this detection
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/configure.diff?cvsroot=dm&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/configure.in.diff?cvsroot=dm&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/Makefile.in.diff?cvsroot=dm&r1=1.16&r2=1.17
--- dmraid/configure 2010/05/30 22:25:37 1.12
+++ dmraid/configure 2010/05/31 09:24:42 1.13
@@ -641,6 +641,7 @@
usrlibdir
STATIC_LINK
SOFLAG
+PTHREAD_LIBS
LIB_SO
LD_DEPS
JOBS
@@ -650,7 +651,10 @@
DMRAID_LIB_MINOR
DMRAID_LIB_MAJOR
DMRAID_LIB_DATE
+DL_LIBS
DIETLIBC
+DEVMAPPER_LIBS
+DEVMAPPER_CFLAGS
DEVMAPPEREVENT_LIBS
DEVMAPPEREVENT_CFLAGS
DEBUG_MALLOC
@@ -751,7 +755,7 @@
enable_static_link
enable_shared_lib
enable_testing
-with_devmapper_event_prefix
+with_devmapper_prefix
'
ac_precious_vars='build_alias
host_alias
@@ -1410,8 +1414,8 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-staticdir=DIR Static binary in DIR [EPREFIX/sbin]
--with-usrlibdir=DIR User library in DIR [PREFIX/lib]
- --with-devmapper-event-prefix=PFX
- Where is 'd-m-e' library installed
+ --with-devmapper-prefix=PFX
+ Where is devmapper library installed
Some influential environment variables:
CC C compiler command
@@ -8914,23 +8918,171 @@
fi
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Check whether --with-devmapper-event-prefix was given.
-if test "${with_devmapper_event_prefix+set}" = set; then
- withval=$with_devmapper_event_prefix; DEVMAPPEREVENT_LIBS="-L$withval/lib"
- DEVMAPPEREVENT_CFLAGS="-I$withval/include"
+ ac_cv_lib_dl_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+ DL_LIBS="-ldl"
else
- DEVMAPPEREVENT_LIBS=
- DEVMAPPEREVENT_CFLAGS=
+ { { $as_echo "$as_me:$LINENO: error: dl library is missing" >&5
+$as_echo "$as_me: error: dl library is missing" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
+$as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_mutex_lock ();
+int
+main ()
+{
+return pthread_mutex_lock ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_pthread_pthread_mutex_lock=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pthread_pthread_mutex_lock=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then
+ PTHREAD_LIBS="-lpthread"
+else
+ { { $as_echo "$as_me:$LINENO: error: pthread library is missing" >&5
+$as_echo "$as_me: error: pthread library is missing" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --with-devmapper-prefix was given.
+if test "${with_devmapper_prefix+set}" = set; then
+ withval=$with_devmapper_prefix; DEVMAPPER_LIBS="-L$withval/lib"
+ DEVMAPPER_CFLAGS="-I$withval/include"
+else
+ DEVMAPPER_LIBS=
+ DEVMAPPER_CFLAGS=
fi
save_LDFLAGS=$LDFLAGS
save_CPPFLAGS=$CPPFLAGS
-LDFLAGS="$LDFLAGS $DEVMAPPEREVENT_LIBS"
-CPPFLAGS="$CPPFLAGS $DEVMAPPEREVENT_CFLAGS"
-{ $as_echo "$as_me:$LINENO: checking for dm_task_set_name in -ldevmapper-event" >&5
-$as_echo_n "checking for dm_task_set_name in -ldevmapper-event... " >&6; }
-if test "${ac_cv_lib_devmapper_event_dm_task_set_name+set}" = set; then
+LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS"
+CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS"
+{ $as_echo "$as_me:$LINENO: checking for dm_event_handler_create in -ldevmapper-event" >&5
+$as_echo_n "checking for dm_event_handler_create in -ldevmapper-event... " >&6; }
+if test "${ac_cv_lib_devmapper_event_dm_event_handler_create+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -8948,11 +9100,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char dm_task_set_name ();
+char dm_event_handler_create ();
int
main ()
{
-return dm_task_set_name ();
+return dm_event_handler_create ();
;
return 0;
}
@@ -8978,12 +9130,12 @@
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
- ac_cv_lib_devmapper_event_dm_task_set_name=yes
+ ac_cv_lib_devmapper_event_dm_event_handler_create=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_devmapper_event_dm_task_set_name=no
+ ac_cv_lib_devmapper_event_dm_event_handler_create=no
fi
rm -rf conftest.dSYM
@@ -8991,16 +9143,89 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_devmapper_event_dm_task_set_name" >&5
-$as_echo "$ac_cv_lib_devmapper_event_dm_task_set_name" >&6; }
-if test "x$ac_cv_lib_devmapper_event_dm_task_set_name" = x""yes; then
- DEVMAPPEREVENT_LIBS="$DEVMAPPEREVENT_LIBS -ldevmapper-event"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_devmapper_event_dm_event_handler_create" >&5
+$as_echo "$ac_cv_lib_devmapper_event_dm_event_handler_create" >&6; }
+if test "x$ac_cv_lib_devmapper_event_dm_event_handler_create" = x""yes; then
+ DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"
else
{ { $as_echo "$as_me:$LINENO: error: device-mapper-event library is either missing or is too old and badly linked" >&5
$as_echo "$as_me: error: device-mapper-event library is either missing or is too old and badly linked" >&2;}
{ (exit 1); exit 1; }; }
fi
+{ $as_echo "$as_me:$LINENO: checking for dm_task_set_name in -ldevmapper" >&5
+$as_echo_n "checking for dm_task_set_name in -ldevmapper... " >&6; }
+if test "${ac_cv_lib_devmapper_dm_task_set_name+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldevmapper $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dm_task_set_name ();
+int
+main ()
+{
+return dm_task_set_name ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_devmapper_dm_task_set_name=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_devmapper_dm_task_set_name=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_devmapper_dm_task_set_name" >&5
+$as_echo "$ac_cv_lib_devmapper_dm_task_set_name" >&6; }
+if test "x$ac_cv_lib_devmapper_dm_task_set_name" = x""yes; then
+ DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"
+else
+ { { $as_echo "$as_me:$LINENO: error: device-mapper library is missing" >&5
+$as_echo "$as_me: error: device-mapper library is missing" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
for ac_header in libdevmapper.h libdevmapper-event.h
@@ -9185,6 +9410,10 @@
+
+
+
+
ac_config_files="$ac_config_files include/Makefile lib/Makefile lib/version.h man/Makefile tools/Makefile tools/version.h Makefile make.tmpl"
cat >confcache <<\_ACEOF
--- dmraid/configure.in 2010/05/30 22:25:36 1.12
+++ dmraid/configure.in 2010/05/31 09:24:42 1.13
@@ -234,22 +234,33 @@
AC_CHECK_HEADERS(getopt.h, AC_DEFINE(HAVE_GETOPTLONG, 1, [Define to 1 for longopt.]))
fi
+AC_CHECK_LIB(dl, dlopen,
+ [DL_LIBS="-ldl"],
+ [AC_MSG_ERROR([dl library is missing])])
+
+AC_CHECK_LIB(pthread, pthread_mutex_lock,
+ [PTHREAD_LIBS="-lpthread"],
+ [AC_MSG_ERROR([pthread library is missing])])
+
dnl FIXME static linking would need some extension here
dnl best would be to use pkg-config in Makefiles
-AC_ARG_WITH(devmapper-event-prefix,
- AC_HELP_STRING([--with-devmapper-event-prefix=PFX],
- [Where is 'd-m-e' library installed]),
- [DEVMAPPEREVENT_LIBS="-L$withval/lib"
- DEVMAPPEREVENT_CFLAGS="-I$withval/include"],
- [DEVMAPPEREVENT_LIBS=
- DEVMAPPEREVENT_CFLAGS=])
+AC_ARG_WITH(devmapper-prefix,
+ AC_HELP_STRING([--with-devmapper-prefix=PFX],
+ [Where is devmapper library installed]),
+ [DEVMAPPER_LIBS="-L$withval/lib"
+ DEVMAPPER_CFLAGS="-I$withval/include"],
+ [DEVMAPPER_LIBS=
+ DEVMAPPER_CFLAGS=])
save_LDFLAGS=$LDFLAGS
save_CPPFLAGS=$CPPFLAGS
-LDFLAGS="$LDFLAGS $DEVMAPPEREVENT_LIBS"
-CPPFLAGS="$CPPFLAGS $DEVMAPPEREVENT_CFLAGS"
-AC_CHECK_LIB(devmapper-event, dm_task_set_name,
- [DEVMAPPEREVENT_LIBS="$DEVMAPPEREVENT_LIBS -ldevmapper-event"],
+LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS"
+CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS"
+AC_CHECK_LIB(devmapper-event, dm_event_handler_create,
+ [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"],
[AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])])
+AC_CHECK_LIB(devmapper, dm_task_set_name,
+ [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"],
+ [AC_MSG_ERROR([device-mapper library is missing])])
AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,,
[AC_MSG_ERROR([Missing headers device-mapper headers])])
CPPFLAGS=$save_CPPFLAGS
@@ -269,7 +280,10 @@
AC_SUBST(DEBUG_MALLOC)
AC_SUBST(DEVMAPPEREVENT_CFLAGS)
AC_SUBST(DEVMAPPEREVENT_LIBS)
+AC_SUBST(DEVMAPPER_CFLAGS)
+AC_SUBST(DEVMAPPER_LIBS)
AC_SUBST(DIETLIBC)
+AC_SUBST(DL_LIBS)
AC_SUBST(DMRAID_LIB_DATE)
AC_SUBST(DMRAID_LIB_MAJOR)
AC_SUBST(DMRAID_LIB_MINOR)
@@ -280,6 +294,7 @@
AC_SUBST(LD_DEPS)
AC_SUBST(LIBS)
AC_SUBST(LIB_SO)
+AC_SUBST(PTHREAD_LIBS)
AC_SUBST(SOFLAG)
AC_SUBST(STATIC_LINK)
AC_SUBST(usrlibdir)
--- dmraid/make.tmpl.in 2010/05/30 22:13:56 1.13
+++ dmraid/make.tmpl.in 2010/05/31 09:24:42 1.14
@@ -19,11 +19,15 @@
SED = @SED@
DEVMAPPEREVENT_CFLAGS = @DEVMAPPEREVENT_CFLAGS@
DEVMAPPEREVENT_LIBS = @DEVMAPPEREVENT_LIBS@
+DEVMAPPER_CFLAGS = @DEVMAPPER_CFLAGS@
+DEVMAPPER_LIBS = @DEVMAPPER_LIBS@
+DL_LIBS = @DL_LIBS@
DMRAID_LIB_DATE = @DMRAID_LIB_DATE@
DMRAID_LIB_MAJOR = @DMRAID_LIB_MAJOR@
DMRAID_LIB_MINOR = @DMRAID_LIB_MINOR@
DMRAID_LIB_SUBMINOR = @DMRAID_LIB_SUBMINOR@
DMRAID_LIB_SUFFIX = @DMRAID_LIB_SUFFIX@
+PTHREAD_LIBS = @PTHREAD_LIBS@
CFLAGS += @CFLAGS@
CLDFLAGS += @CLDFLAGS@
--- dmraid/lib/Makefile.in 2010/05/30 22:21:31 1.16
+++ dmraid/lib/Makefile.in 2010/05/31 09:24:42 1.17
@@ -47,7 +47,6 @@
ifeq ("@STATIC_LINK@", "no")
# Dynamic linker library
- LIBS += -ldl
SOURCES += register/dmreg.c
endif
@@ -74,12 +73,15 @@
DMRAID_LIB_VERSION = $(DMRAID_LIB_MAJOR).$(DMRAID_LIB_MINOR).$(DMRAID_LIB_SUBMINOR)
$(LIB_SHARED): $(OBJECTS) $(LD_DEPS)
- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(DEVMAPPEREVENT_LIBS) \
- -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) $(CLDFLAGS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) \
+ -shared -Wl,--discard-all -Wl,--no-undefined $(CLDFLAGS) \
+ -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \
+ $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS)
$(LIB_EVENTS_SHARED): $(OBJECTS2)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
- -shared -Wl,-soname,$(notdir $@) $(DEVMAPPEREVENT_LIBS) -lpthread
+ -shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \
+ $(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS)
.PHONY: $(addprefix install_,$(TARGETS)) $(addprefix remove_,$(TARGETS))
^ permalink raw reply [flat|nested] 3+ messages in thread
* dmraid ./configure ./configure.in ./make.tmpl. ...
@ 2010-05-30 17:44 zkabelac
0 siblings, 0 replies; 3+ messages in thread
From: zkabelac @ 2010-05-30 17:44 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-30 17:44:56
Modified files:
. : configure configure.in make.tmpl.in
include : config.h.in
Added files:
lib : version.h.in
Log message:
Use LD_DEPS and CLDFLAGS in Makefiles
Move DEBUG and DEBUG_MALLOC to config.h
Add _LARGEFILE64_SOURCE to config.h
Define DMRAID_LIB_MAJOR/MINOR/SUBMINOR/SUFFIX/DATE
Generate lib/version.h
Use $(SED) in Makefiles
Move -include to $(INCLUDE)
Add DISTCLEAN_TARGETS to removed files by distclean
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/configure.diff?cvsroot=dm&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/configure.in.diff?cvsroot=dm&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/include/config.h.in.diff?cvsroot=dm&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/version.h.in.diff?cvsroot=dm&r1=NONE&r2=1.1
--- dmraid/configure 2010/05/29 21:31:35 1.9
+++ dmraid/configure 2010/05/30 17:44:55 1.10
@@ -642,9 +642,14 @@
STATIC_LINK
SOFLAG
LIB_SO
-FLAVOUR
LD_DEPS
JOBS
+FLAVOUR
+DMRAID_LIB_SUFFIX
+DMRAID_LIB_SUBMINOR
+DMRAID_LIB_MINOR
+DMRAID_LIB_MAJOR
+DMRAID_LIB_DATE
DIETLIBC
DEBUG_MALLOC
DEBUG
@@ -6334,8 +6339,8 @@
case "$host_os" in
linux*)
CFLAGS=-O2
- CLDFLAGS="-Wl,--version-script,.export.sym"
- LD_DEPS=".export.sym"
+ CLDFLAGS='-Wl,--version-script,$(top_srcdir)/lib/.export.sym'
+ LD_DEPS='$(top_srcdir)/lib/.export.sym'
SOFLAG="-shared" ;;
esac
fi
@@ -6397,7 +6402,7 @@
$as_echo "$as_me: error: You cannot enable both dietlibc and klibc!" >&2;}
{ (exit 1); exit 1; }; }
fi
- CC="diet gcc"
+ CC="diet gcc"
FLAVOUR="dietlibc "
fi
@@ -6509,7 +6514,7 @@
#define DMRAID_INTEL_LED 1
_ACEOF
- DMRAID_LED=yes
+ DMRAID_LED=yes
fi
if test "$DMRAID_LED" = yes; then
@@ -6528,9 +6533,29 @@
fi
+if test "$DEBUG" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG 1
+_ACEOF
+
+ FLAVOUR="${FLAVOUR}debug "
+fi
+
+if test "$DEBUG_MALLOC" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG_MALLOC 1
+_ACEOF
+
+ FLAVOUR="${FLAVOUR}debug_malloc "
+fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _LARGEFILE64_SOURCE 1
+_ACEOF
-test "$DEBUG" = yes && FLAVOUR="${FLAVOUR}debug "
-test "$DEBUG_MALLOC" = yes && FLAVOUR="${FLAVOUR}debug_malloc "
test "$exec_prefix" = NONE -a "$prefix" = NONE && exec_prefix=""
@@ -8124,6 +8149,18 @@
fi
+VERSION=$srcdir/tools/VERSION
+DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION)
+DMRAID_LIB_MINOR=$(cut -d. -f2 $VERSION)
+DMRAID_LIB_SUBMINOR=$(cut -d. -f3 $VERSION)
+DMRAID_LIB_SUFFIX=$(cut -d. -f4 $VERSION | cut -d' ' -f1)
+DMRAID_LIB_DATE=$(cut -d' ' -f2 $VERSION)
+
+
+
+
+
+
@@ -8140,7 +8177,7 @@
-ac_config_files="$ac_config_files include/Makefile lib/Makefile man/Makefile tools/Makefile tools/version.h Makefile make.tmpl"
+ac_config_files="$ac_config_files include/Makefile lib/Makefile lib/version.h man/Makefile tools/Makefile tools/version.h Makefile make.tmpl"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -8741,6 +8778,7 @@
"include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h:include/config.h.in" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+ "lib/version.h") CONFIG_FILES="$CONFIG_FILES lib/version.h" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"tools/version.h") CONFIG_FILES="$CONFIG_FILES tools/version.h" ;;
--- dmraid/configure.in 2010/05/29 21:31:35 1.9
+++ dmraid/configure.in 2010/05/30 17:44:55 1.10
@@ -73,8 +73,8 @@
case "$host_os" in
linux*)
CFLAGS=-O2
- CLDFLAGS="-Wl,--version-script,.export.sym"
- LD_DEPS=".export.sym"
+ CLDFLAGS='-Wl,--version-script,$(top_srcdir)/lib/.export.sym'
+ LD_DEPS='$(top_srcdir)/lib/.export.sym'
SOFLAG="-shared" ;;
esac
fi
@@ -113,7 +113,7 @@
if test x$KLIBC = xyes; then
AC_MSG_ERROR([You cannot enable both dietlibc and klibc!])
fi
- CC="diet gcc"
+ CC="diet gcc"
FLAVOUR="dietlibc "
fi
@@ -186,21 +186,29 @@
fi
if test "$DMRAID_INTEL_LED" = yes; then
- AC_DEFINE(DMRAID_INTEL_LED, 1, [Define to 1 if you want Intel LED support.])
- DMRAID_LED=yes
+ AC_DEFINE(DMRAID_INTEL_LED, 1, [Define to 1 if you want Intel LED support.])
+ DMRAID_LED=yes
fi
if test "$DMRAID_LED" = yes; then
- AC_DEFINE(DMRAID_LED, 1, [Define to 1 if you want LED support.])
+ AC_DEFINE(DMRAID_LED, 1, [Define to 1 if you want LED support.])
fi
if test "$DMRAID_TEST" = yes; then
- AC_DEFINE(DMRAID_TEST, 1, [Define to 1 if you want to test mapped devices.])
+ AC_DEFINE(DMRAID_TEST, 1, [Define to 1 if you want to test mapped devices.])
fi
+if test "$DEBUG" = yes; then
+ AC_DEFINE(DEBUG, 1, [Define to 1 if you want debug.])
+ FLAVOUR="${FLAVOUR}debug "
+fi
+
+if test "$DEBUG_MALLOC" = yes; then
+ AC_DEFINE(DEBUG_MALLOC, 1, [Define to 1 if you want to debug malloc.])
+ FLAVOUR="${FLAVOUR}debug_malloc "
+fi
-test "$DEBUG" = yes && FLAVOUR="${FLAVOUR}debug "
-test "$DEBUG_MALLOC" = yes && FLAVOUR="${FLAVOUR}debug_malloc "
+AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Define to 1 if you want compile with large file.])
dnl Mess with default exec_prefix
test "$exec_prefix" = NONE -a "$prefix" = NONE && exec_prefix=""
@@ -224,15 +232,27 @@
AC_CHECK_HEADERS(getopt.h, AC_DEFINE(HAVE_GETOPTLONG, 1, [Define to 1 for longopt.]))
fi
+VERSION=$srcdir/tools/VERSION
+DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION)
+DMRAID_LIB_MINOR=$(cut -d. -f2 $VERSION)
+DMRAID_LIB_SUBMINOR=$(cut -d. -f3 $VERSION)
+DMRAID_LIB_SUFFIX=$(cut -d. -f4 $VERSION | cut -d' ' -f1)
+DMRAID_LIB_DATE=$(cut -d' ' -f2 $VERSION)
+
AC_SUBST(CC)
AC_SUBST(CFLAGS)
AC_SUBST(CLDFLAGS)
AC_SUBST(DEBUG)
AC_SUBST(DEBUG_MALLOC)
AC_SUBST(DIETLIBC)
+AC_SUBST(DMRAID_LIB_DATE)
+AC_SUBST(DMRAID_LIB_MAJOR)
+AC_SUBST(DMRAID_LIB_MINOR)
+AC_SUBST(DMRAID_LIB_SUBMINOR)
+AC_SUBST(DMRAID_LIB_SUFFIX)
+AC_SUBST(FLAVOUR)
AC_SUBST(JOBS)
AC_SUBST(LD_DEPS)
-AC_SUBST(FLAVOUR)
AC_SUBST(LIBS)
AC_SUBST(LIB_SO)
AC_SUBST(SOFLAG)
@@ -245,6 +265,7 @@
AC_OUTPUT(
include/Makefile
lib/Makefile
+lib/version.h
man/Makefile
tools/Makefile
tools/version.h
--- dmraid/make.tmpl.in 2010/05/29 21:34:41 1.10
+++ dmraid/make.tmpl.in 2010/05/30 17:44:55 1.11
@@ -17,6 +17,11 @@
LIBS = @LIBS@
AWK = @AWK@
SED = @SED@
+DMRAID_LIB_MAJOR = @DMRAID_LIB_MAJOR@
+DMRAID_LIB_MINOR = @DMRAID_LIB_MINOR@
+DMRAID_LIB_SUBMINOR = @DMRAID_LIB_SUBMINOR@
+DMRAID_LIB_SUFFIX = @DMRAID_LIB_SUFFIX@
+DMRAID_LIB_DATE = @DMRAID_LIB_DATE@
CFLAGS += @CFLAGS@
CLDFLAGS += @CLDFLAGS@
@@ -44,11 +49,10 @@
endif
# setup misc variables
-DMRAID_VERSION := $(shell cat $(top_srcdir)/tools/VERSION)
-DMRAID_LIB_VERSION := $(shell $(SED) --quiet 's/^.*\(DMRAID_LIB_VERSION\)[^_].*"\(.*\)"/\2/p' $(top_srcdir)/lib/version.h)
INSTALL_PROGRAM = $(INSTALL) $(STRIP)
INSTALL_DIR = $(INSTALL) -d
INSTALL_DATA = $(INSTALL) -m 644 -p
+DISTCLEAN_TARGETS += Makefile
# The number of jobs to run, if blank, defaults to the make standard
ifndef MAKEFLAGS
@@ -64,17 +68,13 @@
CFLAGS+=-Wshadow -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
endif
-ifeq ("@DMRAID_TEST@", "yes")
- CFLAGS+=-DDMRAID_TEST
-endif
-
# Don't allow for linking against DSO with static binary.
ifeq ("@STATIC_LINK@", "no")
CFLAGS+=-DDMRAID_AUTOREGISTER
endif
ifeq ("@DEBUG@", "yes")
- CFLAGS+=-g -fno-omit-frame-pointer -DDEBUG
+ CFLAGS+=-g -fno-omit-frame-pointer
else
ifeq ("@KLIBC@", "no")
CFLAGS+=-O2
@@ -83,17 +83,12 @@
endif
endif
-ifeq ("@DEBUG_MALLOC@", "yes")
- CFLAGS+=-DDEBUG_MALLOC
-endif
-
-CFLAGS+=-D_LARGEFILE64_SOURCE
-
-INCLUDES+=-I. -I$(top_srcdir)/include -I$(top_srcdir)/lib
-
+INCLUDES += -I. -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES += -include $(top_builddir)/include/config.h
STRIP=
-DEPS=$(top_srcdir)/make.tmpl $(top_srcdir)/tools/VERSION Makefile
+DEPS = Makefile $(top_srcdir)/make.tmpl \
+ $(top_srcdir)/tools/VERSION $(top_builddir)/include/config.h
OBJECTS=$(SOURCES:%.c=%.o)
OBJECTS2=$(SOURCES2:%.c=%.o)
@@ -130,16 +125,16 @@
$(TARGETS): $(OBJECTS)
-%.o: %.c $(top_builddir)/include/config.h
- $(CC) -o $@ -c $(INCLUDES) $(CFLAGS) -include $(top_builddir)/include/config.h $<
+%.o: %.c
+ $(CC) -o $@ -c $(INCLUDES) $(CFLAGS) $<
%.d: %.c
$(MKDIR_P) $(dir $@); \
set -e; \
- FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
- DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \
+ FILE=`echo $@ | $(SED) 's/\\//\\\\\\//g;s/\\.d//g'`; \
+ DEPS=`echo $(DEPS) | $(SED) -e 's/\\//\\\\\\//g'`; \
$(CC) -MM $(INCLUDES) $(DEFS) $(CFLAGS) -o $@ $<; \
- sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
+ $(SED) -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
[ -s $@ ] || $(RM) $@
$(LIB_STATIC): $(OBJECTS)
@@ -148,14 +143,12 @@
$(RANLIB) $@
cleandir:
- $(RM) $(OBJECTS) $(OBJECTS2) $(TARGETS) $(CLEAN_TARGETS) \
- $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d)
+ $(RM) $(OBJECTS) $(OBJECTS2) $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d) $(TARGETS)
clean: $(SUBDIRS.clean) cleandir
distclean: $(SUBDIRS.distclean) cleandir
- $(RM) cscope.out config.cache config.log config.status \
- Makefile make.tmpl core tools/version.h
+ $(RM) $(DISTCLEAN_TARGETS)
ifeq (,$(findstring $(MAKECMDGOALS), clean distclean))
ifdef SOURCES
--- dmraid/include/config.h.in 2010/05/29 21:31:33 1.1
+++ dmraid/include/config.h.in 2010/05/30 17:44:55 1.2
@@ -1,5 +1,11 @@
/* include/config.h.in. Generated from configure.in by autoheader. */
+/* Define to 1 if you want debug. */
+#undef DEBUG
+
+/* Define to 1 if you want to debug malloc. */
+#undef DEBUG_MALLOC
+
/* Define to 1 if you want Intel LED support. */
#undef DMRAID_INTEL_LED
@@ -172,6 +178,9 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
+/* Define to 1 if you want compile with large file. */
+#undef _LARGEFILE64_SOURCE
+
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
#define below would cause a syntax error. */
/cvs/dm/dmraid/lib/version.h.in,v --> standard output
revision 1.1
--- dmraid/lib/version.h.in
+++ - 2010-05-30 17:44:56.868513000 +0000
@@ -0,0 +1,9 @@
+#ifndef DMRAID_LIB_DATE
+
+#define DMRAID_LIB_DATE "@DMRAID_LIB_DATE@"
+#define DMRAID_LIB_MAJOR_VERSION @DMRAID_LIB_MAJOR@
+#define DMRAID_LIB_MINOR_VERSION @DMRAID_LIB_MINOR@
+#define DMRAID_LIB_SUBMINOR_VERSION @DMRAID_LIB_SUBMINOR@
+#define DMRAID_LIB_VERSION_SUFFIX "@DMRAID_LIB_SUFFIX@"
+
+#endif
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-31 9:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-30 19:15 dmraid ./configure ./configure.in ./make.tmpl. zkabelac
-- strict thread matches above, loose matches on Subject: below --
2010-05-31 9:24 zkabelac
2010-05-30 17:44 zkabelac
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.